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

A few fixes on 3D scene toolbar

Browse source
This commit is contained in:
Enrico Turri 2018-07-27 14:38:19 +02:00
parent 590773d77b
commit c64cba8ec2
4 changed files with 101 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

14
xs/src/slic3r/GUI/GLToolbar.hpp
View file

@ -66,6 +66,9 @@ public:
void do_action();
bool is_enabled() const;
bool is_hovered() const;
bool is_pressed() const;
bool is_toggable() const;
bool is_separator() const;
};
@ -85,6 +88,7 @@ public:
private:
typedef std::vector<GLToolbarItem*> ItemsList;
GLCanvas3D& m_parent;
bool m_enabled;
ItemsList m_items;
@ -94,7 +98,7 @@ private:
float m_separator_x;
public:
GLToolbar();
explicit GLToolbar(GLCanvas3D& parent);
bool is_enabled() const;
void set_enabled(bool enable);
@ -112,14 +116,14 @@ public:
bool is_item_pressed(const std::string& name) const;
void update_hover_state(GLCanvas3D& canvas, const Pointf& mouse_pos);
void update_hover_state(const Pointf& mouse_pos);
// returns the id of the item under the given mouse position or -1 if none
int contains_mouse(const GLCanvas3D& canvas, const Pointf& mouse_pos) const;
int contains_mouse(const Pointf& mouse_pos) const;
void do_action(unsigned int item_id, GLCanvas3D& canvas);
void do_action(unsigned int item_id);
void render(const GLCanvas3D& canvas, const Pointf& mouse_pos) const;
void render(const Pointf& mouse_pos) const;
private:
float _get_total_width() const;