3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 17:27:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/vb_undo_redo' into ys_undo_redo

Browse source
This commit is contained in:
YuSanka 2019-07-10 11:38:52 +02:00
commit baece78390
2 changed files with 52 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r/GUI/GLToolbar.hpp
View file

@ -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; }