Merge remote-tracking branch 'origin/master'

4 files changed, 44 insertions, 5 deletions

diff --git a/src/interface/Engine.cpp b/src/interface/Engine.cpp
index 6f81f56..85a6293 100644
--- a/src/interface/Engine.cpp
+++ b/src/interface/Engine.cpp
@@ -19,7 +19,9 @@ Engine::Engine():
 	mousexp_(0),
 	mouseyp_(0),
 	FpsLimit(60.0f),
-	windows(stack<Window*>())
+	windows(stack<Window*>()),
+	lastBuffer(NULL),
+	prevBuffers(stack<pixel*>())
 {
 }
 
@@ -51,17 +53,44 @@ void Engine::Exit()
 
 void Engine::ShowWindow(Window * window)
 {
+	if(window->Position.X==-1)
+	{
+		window->Position.X = (width_-window->Size.X)/2;
+	}
+	if(window->Position.Y==-1)
+	{
+		window->Position.Y = (height_-window->Size.Y)/2;
+	}
 	if(state_)
 	{
+		if(lastBuffer)
+		{
+			prevBuffers.push(lastBuffer);
+		}
+		lastBuffer = (pixel*)malloc((width_ * height_) * PIXELSIZE);
+		g->fillrect(0, 0, width_, height_, 0, 0, 0, 100);
+		memcpy(lastBuffer, g->vid, (width_ * height_) * PIXELSIZE);
+
 		windows.push(state_);
 	}
 	state_ = window;
+
 }
 
 void Engine::CloseWindow()
 {
 	if(!windows.empty())
 	{
+		if(!prevBuffers.empty())
+		{
+			lastBuffer = prevBuffers.top();
+			prevBuffers.pop();
+		}
+		else
+		{
+			free(lastBuffer);
+			lastBuffer = NULL;
+		}
 		state_ = windows.top();
 		windows.pop();
 	}
@@ -112,10 +141,17 @@ void Engine::Tick(float dt)
 
 void Engine::Draw()
 {
+	if(lastBuffer && !(state_->Position.X == 0 && state_->Position.Y == 0 && state_->Size.X == width_ && state_->Size.Y == height_))
+	{
+		memcpy(g->vid, lastBuffer, (width_ * height_) * PIXELSIZE);
+	}
+	else
+	{
+		g->Clear();
+	}
 	if(state_)
 		state_->DoDraw();
 	g->Blit();
-	g->Clear();
 }
 
 void Engine::onKeyPress(int key, bool shift, bool ctrl, bool alt)
diff --git a/src/interface/Engine.h b/src/interface/Engine.h
index 7bf78f9..a648119 100644
--- a/src/interface/Engine.h
+++ b/src/interface/Engine.h
@@ -54,6 +54,8 @@ namespace ui
 		float FpsLimit;
 		Graphics * g;
 	private:
+		pixel * lastBuffer;
+		std::stack<pixel*> prevBuffers;
 		std::stack<Window*> windows;
 		//Window* statequeued_;
 		Window* state_;
diff --git a/src/interface/SaveButton.h b/src/interface/SaveButton.h
index 8019a3c..65cff52 100644
--- a/src/interface/SaveButton.h
+++ b/src/interface/SaveButton.h
@@ -39,6 +39,7 @@ public:
 	virtual void Draw(const Point& screenPos);
 	virtual void Tick(float dt);
 
+	Save * GetSave() { return save; }
 	inline bool GetState() { return state; }
 	virtual void DoAction();
 	void SetActionCallback(SaveButtonAction * action);
diff --git a/src/interface/Window.h b/src/interface/Window.h
index 581b91f..4fc2b14 100644
--- a/src/interface/Window.h
+++ b/src/interface/Window.h
@@ -23,6 +23,9 @@ enum ChromeStyle
 	class Window
 	{
 	public:
+		Point Position;
+		Point Size;
+
 		Window(Point _position, Point _size);
 		virtual ~Window();
 
@@ -74,9 +77,6 @@ enum ChromeStyle
 		virtual void OnKeyRelease(int key, bool shift, bool ctrl, bool alt) {}
 		std::vector<Component*> Components;
 		Component* focusedComponent_;
-
-		Point Position;
-		Point Size;
 		ChromeStyle chrome;
 
 	};