diff --git a/src/widget.cpp b/src/widget.cpp index 7ad67ab32..141497f79 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -24,9 +24,13 @@ //FIXME: this should be removed when the scrolling is cleaned #include "user_config.hpp" +#include "constants.hpp" #include #include +const float Widget::MAX_TEXT_SCALE = 1.2f; +const float Widget::MIN_TEXT_SCALE = 1.0f; + const GLfloat WGT_WHITE [4] = { 1.0f, 1.0f, 1.0f, 1.0f }; const GLfloat WGT_GRAY [4] = { 0.5f, 0.5f, 0.5f, 1.0f }; const GLfloat WGT_BLACK [4] = { 0.0f, 0.0f, 0.0f, 1.0f }; diff --git a/src/widget.hpp b/src/widget.hpp index a8a6bda05..237f6084b 100644 --- a/src/widget.hpp +++ b/src/widget.hpp @@ -27,6 +27,10 @@ #ifdef __APPLE__ # include #else +# ifdef WIN32 +# define WIN32_LEAN_AND_MEAN +# include +# endif # include #endif @@ -115,8 +119,8 @@ class Widget /* Delta time dependant features, these deactivate after a certain time, * and are dependant on the delta time. They have animations. */ - static const float MAX_TEXT_SCALE = 1.2f; - static const float MIN_TEXT_SCALE = 1.0f; + static const float MAX_TEXT_SCALE; + static const float MIN_TEXT_SCALE; float m_text_scale; //Used for the pulse effect /*public:*/