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

Gizmo Measure - Fixed point color and hint in dialog when adding a point on a selected feature

Browse Source
This commit is contained in:
enricoturri1966 2022-11-21 12:01:22 +01:00
parent 38d2e0605a
commit ab5c81a2ef
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
View File

@ -867,7 +867,9 @@ void GLGizmoMeasure::on_render()
}; };
auto hover_selection_color = [this]() { auto hover_selection_color = [this]() {
return (!m_selected_features.first.feature.has_value() || *m_curr_feature == *m_selected_features.first.feature) ? SELECTED_1ST_COLOR : SELECTED_2ND_COLOR; return ((m_mode == EMode::PointSelection && !m_selected_features.first.feature.has_value()) ||
(m_mode != EMode::PointSelection && (!m_selected_features.first.feature.has_value() || *m_curr_feature == *m_selected_features.first.feature))) ?
SELECTED_1ST_COLOR : SELECTED_2ND_COLOR;
}; };
auto hovering_color = [this, hover_selection_color, &selection]() { auto hovering_color = [this, hover_selection_color, &selection]() {
@ -1731,12 +1733,15 @@ void GLGizmoMeasure::on_render_input_window(float x, float y, float bottom_limit
} }
else { else {
if (m_selected_features.first.feature.has_value()) { if (m_selected_features.first.feature.has_value()) {
if (m_selected_features.first.feature == m_curr_feature) if (m_selected_features.first.feature == m_curr_feature && m_mode == EMode::FeatureSelection) {
text = _u8L("Unselect feature"); text = _u8L("Unselect feature");
else if (m_hover_id == SELECTION_1_ID) color = SELECTED_1ST_COLOR;
}
else if (m_hover_id == SELECTION_1_ID) {
text = (m_mode == EMode::CenterSelection) ? _u8L("Unselect center") : _u8L("Unselect point"); text = (m_mode == EMode::CenterSelection) ? _u8L("Unselect center") : _u8L("Unselect point");
color = SELECTED_1ST_COLOR; color = SELECTED_1ST_COLOR;
} }
}
if (text.empty()) { if (text.empty()) {
text = (m_mode == EMode::PointSelection) ? _u8L("Select point") : text = (m_mode == EMode::PointSelection) ? _u8L("Select point") :
(m_mode == EMode::CenterSelection) ? _u8L("Select center") : _u8L("Select feature"); (m_mode == EMode::CenterSelection) ? _u8L("Select center") : _u8L("Select feature");