diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-11-02 11:31:01 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-11-02 11:31:01 -0300 |
| commit | d85b67be53bac252c0a28b799d56d1b359c4ee99 (patch) | |
| tree | 5227e145e3271bfee542bdd3e4237c3378565306 /scene/gui/base_button.h | |
| parent | 738eb2c1a88d441eacc4149ce8f1c12a90267191 (diff) | |
| download | redot-engine-d85b67be53bac252c0a28b799d56d1b359c4ee99.tar.gz | |
Bug Fixes
-=-=-=-=-
-Fixed problem with scaling shapes (#827), related to not taking scale in consideration for calculating the moment of inertia
-Added support for multiline strings (or comments) using """
-Save subscene bug, properties not being saved in root node (#806)
-Fix Crash in CollisionPolygon2DEditor (#814)
-Restored Ability to compile without 3D (#795)
-Fix InterpolatedCamera (#803)
-Fix UV Import for OBJ Meshes (#771)
-Fixed issue with modifier gizmos (#794)
-Fixed CapsuleShape gizmo handle (#50)
-Fixed Import Button (not properly working in 3D) (#733)
-Many misc fixes (though no new features)
Diffstat (limited to 'scene/gui/base_button.h')
| -rw-r--r-- | scene/gui/base_button.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/scene/gui/base_button.h b/scene/gui/base_button.h index a2c640b9cf..a376591ebb 100644 --- a/scene/gui/base_button.h +++ b/scene/gui/base_button.h @@ -61,15 +61,8 @@ class BaseButton : public Control { protected: - enum DrawMode { - DRAW_NORMAL, - DRAW_PRESSED, - DRAW_HOVER, - DRAW_DISABLED, - }; - DrawMode get_draw_mode() const; virtual void pressed(); virtual void toggled(bool p_pressed); @@ -78,7 +71,16 @@ protected: void _notification(int p_what); public: - + + enum DrawMode { + DRAW_NORMAL, + DRAW_PRESSED, + DRAW_HOVER, + DRAW_DISABLED, + }; + + DrawMode get_draw_mode() const; + /* Signals */ bool is_pressed() const; ///< return wether button is pressed (toggled in) @@ -101,4 +103,6 @@ public: }; +VARIANT_ENUM_CAST( BaseButton::DrawMode ); + #endif |