Merge branch 'HEAD' of git@github.com:FacialTurd/The-Powder-Toy.git

2 files changed, 13 insertions, 2 deletions

diff --git a/src/gui/render/RenderView.cpp b/src/gui/render/RenderView.cpp
index 3b3a91a..8c09ceb 100644
--- a/src/gui/render/RenderView.cpp
+++ b/src/gui/render/RenderView.cpp
@@ -80,6 +80,7 @@ RenderView::RenderView():
 	ui::Window(ui::Point(0, 0), ui::Point(XRES, YRES+MENUSIZE)),
 	toolTip(""),
 	toolTipPresence(0),
+	isToolTipFadingIn(false),
 	ren(NULL)
 {
 	ui::Button * presetButton;
@@ -373,6 +374,16 @@ void RenderView::OnDraw()
 
 void RenderView::OnTick(float dt)
 {
+	if (isToolTipFadingIn)
+	{
+		isToolTipFadingIn = false;
+		if(toolTipPresence < 120)
+		{
+			toolTipPresence += int(dt*2)>0?int(dt*2):1;
+			if(toolTipPresence > 120)
+				toolTipPresence = 0;
+		}
+	}
 	if(toolTipPresence>0)
 	{
 		toolTipPresence -= int(dt)>0?int(dt):1;
@@ -394,8 +405,7 @@ void RenderView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bo
 void RenderView::ToolTip(ui::Component * sender, ui::Point mousePosition, std::string toolTip)
 {
 	this->toolTip = toolTip;
-	if (toolTipPresence < 120)
-		toolTipPresence += 3;
+	this->isToolTipFadingIn = true;
 }
 
 RenderView::~RenderView() {
diff --git a/src/gui/render/RenderView.h b/src/gui/render/RenderView.h
index 8a65eb1..4cf8cf0 100644
--- a/src/gui/render/RenderView.h
+++ b/src/gui/render/RenderView.h
@@ -20,6 +20,7 @@ class RenderView: public ui::Window {
 	std::vector<ui::Checkbox*> colourModes;
 	std::string toolTip;
 	int toolTipPresence;
+	bool isToolTipFadingIn;
 	int line1, line2, line3, line4;
 public:
 	class RenderModeAction;