summaryrefslogtreecommitdiff
path: root/src/gui/render/RenderView.h
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-05-17 16:44:25 (GMT)
committer jacob1 <jfu614@gmail.com>2013-05-17 16:44:25 (GMT)
commit981f6984c2c0f87d54a9c90f4518c69c9ef02ae0 (patch)
tree757bd699a23c1fad61e60700265a25feb1a3042c /src/gui/render/RenderView.h
parentcbd402d8cb6aa699ffde83a1b5b3c2f4fc51baaf (diff)
parent77bf649fb4482c86ac1fd9b3233f062b53226007 (diff)
downloadpowder-981f6984c2c0f87d54a9c90f4518c69c9ef02ae0.zip
powder-981f6984c2c0f87d54a9c90f4518c69c9ef02ae0.tar.gz
Merge branch 'HEAD' of git@github.com:FacialTurd/The-Powder-Toy.git
Diffstat (limited to 'src/gui/render/RenderView.h')
-rw-r--r--src/gui/render/RenderView.h1
1 files changed, 1 insertions, 0 deletions
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;