mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-03 06:20:36 +08:00
Fix for SPE-1788 - Redundant sidebar layout on object move
This commit is contained in:
parent
10b6d355ca
commit
724d2aec20
@ -503,6 +503,11 @@ void ObjectManipulation::Show(const bool show)
|
|||||||
}
|
}
|
||||||
m_word_local_combo->Show(show_world_local_combo);
|
m_word_local_combo->Show(show_world_local_combo);
|
||||||
m_empty_str->Show(!show_world_local_combo);
|
m_empty_str->Show(!show_world_local_combo);
|
||||||
|
|
||||||
|
m_skew_label->Show(m_show_skew);
|
||||||
|
m_reset_skew_button->Show(m_show_skew);
|
||||||
|
|
||||||
|
m_parent->Layout();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -795,9 +800,15 @@ void ObjectManipulation::update_reset_buttons_visibility()
|
|||||||
m_mirror_warning_bitmap->SetBitmap(show_mirror ? m_manifold_warning_bmp.bmp() : wxNullBitmap);
|
m_mirror_warning_bitmap->SetBitmap(show_mirror ? m_manifold_warning_bmp.bmp() : wxNullBitmap);
|
||||||
m_mirror_warning_bitmap->SetMinSize(show_mirror ? m_manifold_warning_bmp.GetSize() : wxSize(0, 0));
|
m_mirror_warning_bitmap->SetMinSize(show_mirror ? m_manifold_warning_bmp.GetSize() : wxSize(0, 0));
|
||||||
m_mirror_warning_bitmap->SetToolTip(show_mirror ? _L("Left handed") : "");
|
m_mirror_warning_bitmap->SetToolTip(show_mirror ? _L("Left handed") : "");
|
||||||
m_reset_skew_button->Show(show_skew);
|
|
||||||
m_skew_label->Show(show_skew);
|
|
||||||
|
|
||||||
|
if (m_show_skew == show_skew)
|
||||||
|
get_sizer()->Layout();
|
||||||
|
else {
|
||||||
|
// Call sidebar layout only if it's really needed,
|
||||||
|
// it means, when we show/hide additional line for skew information
|
||||||
|
m_show_skew = show_skew;
|
||||||
|
m_reset_skew_button->Show(m_show_skew);
|
||||||
|
m_skew_label->Show(m_show_skew);
|
||||||
// Because of CallAfter we need to layout sidebar after Show/hide of reset buttons one more time
|
// Because of CallAfter we need to layout sidebar after Show/hide of reset buttons one more time
|
||||||
Sidebar& panel = wxGetApp().sidebar();
|
Sidebar& panel = wxGetApp().sidebar();
|
||||||
if (!panel.IsFrozen()) {
|
if (!panel.IsFrozen()) {
|
||||||
@ -805,6 +816,7 @@ void ObjectManipulation::update_reset_buttons_visibility()
|
|||||||
panel.Layout();
|
panel.Layout();
|
||||||
panel.Thaw();
|
panel.Thaw();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -169,6 +169,7 @@ private:
|
|||||||
bool m_is_enabled { true };
|
bool m_is_enabled { true };
|
||||||
bool m_is_enabled_size_and_scale { true };
|
bool m_is_enabled_size_and_scale { true };
|
||||||
|
|
||||||
|
bool m_show_skew { false };
|
||||||
|
|
||||||
public:
|
public:
|
||||||
ObjectManipulation(wxWindow* parent);
|
ObjectManipulation(wxWindow* parent);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user