3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved Tooltips for selected action icon

Browse source
This commit is contained in:
YuSanka 2019-10-09 15:06:52 +02:00
parent 20c7801264
commit 6ac53aa4f3
2 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/slic3r/GUI/wxExtensions.cpp
View file

@ -2577,12 +2577,19 @@ void DoubleSlider::draw_action_icon(wxDC& dc, const wxPoint pt_beg, const wxPoin
if (tick == 0) if (tick == 0)
return; return;
wxBitmap* icon = m_is_action_icon_focesed ? &m_bmp_add_tick_off.bmp() : &m_bmp_add_tick_on.bmp();
// #ys_FIXME_COLOR // #ys_FIXME_COLOR
// wxBitmap* icon = m_is_action_icon_focesed ? &m_bmp_add_tick_off.bmp() : &m_bmp_add_tick_on.bmp();
// if (m_ticks.find(tick) != m_ticks.end()) // if (m_ticks.find(tick) != m_ticks.end())
// icon = m_is_action_icon_focesed ? &m_bmp_del_tick_off.bmp() : &m_bmp_del_tick_on.bmp(); // icon = m_is_action_icon_focesed ? &m_bmp_del_tick_off.bmp() : &m_bmp_del_tick_on.bmp();
if (m_ticks_.find(tick) != m_ticks_.end()) wxBitmap* icon = m_action_icon_focesed > 0 ? &m_bmp_add_tick_off.bmp() : &m_bmp_add_tick_on.bmp();
icon = m_is_action_icon_focesed ? &m_bmp_del_tick_off.bmp() : &m_bmp_del_tick_on.bmp(); auto tick_code_it = m_ticks_.find(tick);
if (tick_code_it != m_ticks_.end()) {
icon = m_action_icon_focesed > 0 ? &m_bmp_del_tick_off.bmp() : &m_bmp_del_tick_on.bmp();
if (m_action_icon_focesed > 0)
m_action_icon_focesed = tick_code_it->gcode == "M600" ? fiDelColorChange :
tick_code_it->gcode == "M25" ? fiDelPause : fiDelCustomCode;
}
wxCoord x_draw, y_draw; wxCoord x_draw, y_draw;
is_horizontal() ? x_draw = pt_beg.x - 0.5*m_tick_icon_dim : y_draw = pt_beg.y - 0.5*m_tick_icon_dim; is_horizontal() ? x_draw = pt_beg.x - 0.5*m_tick_icon_dim : y_draw = pt_beg.y - 0.5*m_tick_icon_dim;
@ -3010,9 +3017,10 @@ void DoubleSlider::OnMotion(wxMouseEvent& event)
bool is_revert_icon_focused = false; bool is_revert_icon_focused = false;
if (!m_is_left_down && !m_is_one_layer) { if (!m_is_left_down && !m_is_one_layer) {
m_is_action_icon_focesed = is_point_in_rect(pos, m_rect_tick_action);
// #ys_FIXME_COLOR // #ys_FIXME_COLOR
// m_is_action_icon_focesed = is_point_in_rect(pos, m_rect_tick_action);
// is_revert_icon_focused = !m_ticks.empty() && is_point_in_rect(pos, m_rect_revert_icon); // is_revert_icon_focused = !m_ticks.empty() && is_point_in_rect(pos, m_rect_revert_icon);
m_action_icon_focesed = is_point_in_rect(pos, m_rect_tick_action) ? fiAdd : fiNone;
is_revert_icon_focused = !m_ticks_.empty() && is_point_in_rect(pos, m_rect_revert_icon); is_revert_icon_focused = !m_ticks_.empty() && is_point_in_rect(pos, m_rect_revert_icon);
} }
else if (m_is_left_down || m_is_right_down) { else if (m_is_left_down || m_is_right_down) {
@ -3028,7 +3036,6 @@ void DoubleSlider::OnMotion(wxMouseEvent& event)
correct_higher_value(); correct_higher_value();
action = (current_value != m_higher_value); action = (current_value != m_higher_value);
} }
if (m_is_right_down) m_is_mouse_move = true;
} }
Refresh(); Refresh();
Update(); Update();
@ -3036,7 +3043,11 @@ void DoubleSlider::OnMotion(wxMouseEvent& event)
// Set tooltips with information for each icon // Set tooltips with information for each icon
const wxString tooltip = m_is_one_layer_icon_focesed ? _(L("One layer mode")) : const wxString tooltip = m_is_one_layer_icon_focesed ? _(L("One layer mode")) :
m_is_action_icon_focesed ? _(L("Add/Del color change")) : // m_is_action_icon_focesed ? _(L("Add/Del color change")) :
m_action_icon_focesed == fiAdd ? _(L("Add color change")) :
m_action_icon_focesed == fiDelColorChange ? _(L("Delete color change")) :
m_action_icon_focesed == fiDelPause ? _(L("Delete pause")) :
m_action_icon_focesed == fiDelCustomCode ? _(L("Delete custom code")) :
is_revert_icon_focused ? _(L("Discard all color changes")) : ""; is_revert_icon_focused ? _(L("Discard all color changes")) : "";
this->SetToolTip(tooltip); this->SetToolTip(tooltip);

8
src/slic3r/GUI/wxExtensions.hpp
View file

@ -883,6 +883,14 @@ private:
bool m_is_one_layer = false; bool m_is_one_layer = false;
bool m_is_focused = false; bool m_is_focused = false;
bool m_is_action_icon_focesed = false; bool m_is_action_icon_focesed = false;
enum FocusedIcon
{
fiNone = 0,
fiAdd,
fiDelColorChange,
fiDelPause,
fiDelCustomCode
} m_action_icon_focesed { fiNone };
bool m_is_one_layer_icon_focesed = false; bool m_is_one_layer_icon_focesed = false;
bool m_is_enabled_tick_manipulation = true; bool m_is_enabled_tick_manipulation = true;
bool m_show_context_menu = false; bool m_show_context_menu = false;