diff options
| author | YuSanka <yusanka@gmail.com> | 2019-07-10 12:38:52 +0300 |
|---|---|---|
| committer | YuSanka <yusanka@gmail.com> | 2019-07-10 12:38:52 +0300 |
| commit | baece78390327068526182413fd5431f90f95975 (patch) | |
| tree | 582ec6e602e4344f86cd36ee91ea6ee710ce0300 /src/slic3r/GUI/GLToolbar.hpp | |
| parent | 99df9f56c4a68660d819180caa15f538b7341c5d (diff) | |
| parent | 46e295407b3c568e39cebb79dc8b3c3dbca386c3 (diff) | |
Merge remote-tracking branch 'origin/vb_undo_redo' into ys_undo_redo
Diffstat (limited to 'src/slic3r/GUI/GLToolbar.hpp')
| -rw-r--r-- | src/slic3r/GUI/GLToolbar.hpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/slic3r/GUI/GLToolbar.hpp b/src/slic3r/GUI/GLToolbar.hpp index 78dd56081..2ba1bb31b 100644 --- a/src/slic3r/GUI/GLToolbar.hpp +++ b/src/slic3r/GUI/GLToolbar.hpp @@ -253,6 +253,7 @@ private: MouseCapture m_mouse_capture; std::string m_tooltip; int m_imgui_hovered_pos { -1 }; + unsigned int m_pressed_toggable_id; public: #if ENABLE_SVG_ICONS @@ -299,6 +300,8 @@ public: bool is_item_disabled(const std::string& name) const; bool is_item_visible(const std::string& name) const; + bool is_any_item_pressed() const; + const std::string& get_tooltip() const { return m_tooltip; } |