add ScrollWindow (makes ProfileViewer scrollable if necessary)

Author: jacob1

src/gui/profile/ProfileViewer.cpp

@@ -8,7 +8,7 @@
 #include "json/json.h"
 
 ProfileViewer::ProfileViewer(std::string profileName):
-	Window_(Point(CENTERED, CENTERED), Point(260, 350)),
+	ScrollWindow(Point(CENTERED, CENTERED), Point(260, 350)),
 	name(profileName),
 	avatar(NULL),
 	ageLabel(NULL),
@@ -81,6 +81,8 @@ void ProfileViewer::OnTick(float dt)
 			this->AddComponent(locationLabel);
 			this->AddComponent(websiteLabel);
 			this->AddComponent(biographyLabel);
+			if (biographyLabel->GetSize().Y+115 > this->GetSize().Y)
+				this->SetScrollable(true, biographyLabel->GetSize().Y+117-this->GetSize().Y*2);
 
 			// If we don't do this average score will have a ton of decimal points, round to 2 here
 			float average = root["User"]["Saves"]["AverageScore"].asFloat();
@@ -128,13 +130,13 @@ void ProfileViewer::OnTick(float dt)
 void ProfileViewer::OnDraw(VideoBuffer *buf)
 {
 	if (avatar)
-		buf->DrawImage(avatar, 210, 10, 40, 40);
-	buf->DrawText(10, 22, "Age:", 175, 175, 175, 255);
-	buf->DrawText(10, 34, "Location:", 175, 175, 175, 255);
-	buf->DrawText(10, 46, "Website:", 175, 175, 175, 255);
-	buf->DrawText(10, 58, "Saves:", 175, 175, 175, 255);
-	buf->DrawText(15, 70, "Count:", 175, 175, 175, 255);
-	buf->DrawText(15, 82, "Average Score:", 175, 175, 175, 255);
-	buf->DrawText(15, 94, "Highest Score:", 175, 175, 175, 255);
-	buf->DrawText(10, 106, "Biography:", 175, 175, 175, 255);
+		buf->DrawImage(avatar, 210, 10-GetScrollPosition(), 40, 40);
+	buf->DrawText(10, 22-GetScrollPosition(), "Age:", 175, 175, 175, 255);
+	buf->DrawText(10, 34-GetScrollPosition(), "Location:", 175, 175, 175, 255);
+	buf->DrawText(10, 46-GetScrollPosition(), "Website:", 175, 175, 175, 255);
+	buf->DrawText(10, 58-GetScrollPosition(), "Saves:", 175, 175, 175, 255);
+	buf->DrawText(15, 70-GetScrollPosition(), "Count:", 175, 175, 175, 255);
+	buf->DrawText(15, 82-GetScrollPosition(), "Average Score:", 175, 175, 175, 255);
+	buf->DrawText(15, 94-GetScrollPosition(), "Highest Score:", 175, 175, 175, 255);
+	buf->DrawText(10, 106-GetScrollPosition(), "Biography:", 175, 175, 175, 255);
 }

src/gui/profile/ProfileViewer.h

@@ -2,12 +2,12 @@
 #define PROFILEVIEWER_H
 
 #include <string>
-#include "interface/Window.h"
+#include "interface/ScrollWindow.h"
 #include "graphics.h"
 
 class Download;
 class Label;
-class ProfileViewer : public Window_
+class ProfileViewer : public ScrollWindow
 {
 	std::string name;
 	Download *profileInfoDownload;

src/interface/Component.h

@@ -31,6 +31,8 @@ class Component
 	virtual void OnTick() { }
 
 	virtual void OnDefocus() { }
+
+	friend class ScrollWindow;
 };
 
 #endif

src/interface/ScrollWindow.cpp

@@ -0,0 +1,39 @@
+#include "ScrollWindow.h"
+
+ScrollWindow::ScrollWindow(Point position, Point size):
+	Window_(position, size),
+	scrollable(false),
+	scrollSize(size.Y),
+	scrolled(0)
+{
+}
+
+void ScrollWindow::DoMouseWheel(int x, int y, int d)
+{
+	if (scrollable)
+	{
+		int oldScrolled = scrolled;
+		if (d > 0 && scrolled > 0)
+			scrolled = std::max(scrolled-d*4, 0);
+		else if (d < 0 && scrolled < size.Y + scrollSize)
+			scrolled = std::min(scrolled-d*4, size.Y + scrollSize);
+
+		for (std::vector<Component*>::iterator iter = Components.begin(), end = Components.end(); iter != end; iter++)
+		{
+			(*iter)->position.Y -= (scrolled-oldScrolled);
+		}
+	}
+
+	/*for (std::vector<Component*>::iterator iter = Components.begin(), end = Components.end(); iter != end; iter++)
+	{
+		(*iter)->OnMouseWheel(x, y, d);
+	}*/
+
+	OnMouseWheel(x, y, d);
+}
+
+void ScrollWindow::SetScrollable(bool scroll, int maxScroll)
+{
+	scrollable = scroll;
+	scrollSize = maxScroll;
+}

src/interface/ScrollWindow.h

@@ -0,0 +1,21 @@
+#ifndef SCROLLWINDOW_H
+#define SCROLLWINDOW_H
+
+#include "Window.h"
+
+class ScrollWindow : public Window_
+{
+	bool scrollable;
+	int scrollSize, scrolled;
+
+public:
+	ScrollWindow(Point position, Point size);
+
+	void SetScrollable(bool scroll, int maxScroll);
+	int GetScrollPosition() { return scrolled; }
+
+protected:
+	void DoMouseWheel(int x, int y, int d);
+};
+
+#endif

src/interface/Window.h

@@ -8,14 +8,6 @@
 class VideoBuffer;
 class Window_
 {
-private:
-	Point position;
-	Point size;
-	VideoBuffer* videoBuffer;
-	std::vector<Component*> Components;
-	Component* focused;
-	Component* clicked;
-
 public:
 	Window_(Point position, Point size);
 	~Window_();
@@ -32,17 +24,22 @@ class Window_
 	void DoMouseMove(int x, int y, int dx, int dy);
 	void DoMouseDown(int x, int y, unsigned char button);
 	void DoMouseUp(int x, int y, unsigned char button);
-	void DoMouseWheel(int x, int y, int d);
+	virtual void DoMouseWheel(int x, int y, int d);
 	void DoKeyPress(int key, unsigned short character, unsigned char modifiers);
 	void DoKeyRelease(int key, unsigned short character, unsigned char modifiers);
 
+	Point GetPosition() { return position; }
+	Point GetSize() { return size; }
 	VideoBuffer* GetVid() { return videoBuffer; }
 
 	bool toDelete;
 
 	static const int CENTERED = -1;
 
 protected:
+	Point position;
+	Point size;
+	std::vector<Component*> Components;
 
 	virtual void OnTick(float dt) { }
 	virtual void OnDraw(VideoBuffer *buf) { }
@@ -52,6 +49,11 @@ class Window_
 	virtual void OnMouseWheel(int x, int y, int d) { }
 	virtual void OnKeyPress(int key, unsigned short character, unsigned char modifiers) { }
 	virtual void OnKeyRelease(int key, unsigned short character, unsigned char modifiers) { }
+
+private:
+	VideoBuffer* videoBuffer;
+	Component* focused;
+	Component* clicked;
 };
 
 #endif