GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-01 11:31:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for SPE-1788 - Redundant sidebar layout on object move

Browse Source
This commit is contained in:
YuSanka 2023-06-19 10:09:08 +02:00 committed by Lukas Matena
parent 10b6d355ca
commit 724d2aec20
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/slic3r/GUI/GUI_ObjectManipulation.cpp
View File

@ -503,6 +503,11 @@ void ObjectManipulation::Show(const bool show)
}
m_word_local_combo->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,15 +800,22 @@ void ObjectManipulation::update_reset_buttons_visibility()
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->SetToolTip(show_mirror ? _L("Left handed") : "");
m_reset_skew_button->Show(show_skew);
m_skew_label->Show(show_skew);
// Because of CallAfter we need to layout sidebar after Show/hide of reset buttons one more time
Sidebar& panel = wxGetApp().sidebar();
if (!panel.IsFrozen()) {
panel.Freeze();
panel.Layout();
panel.Thaw();
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
Sidebar& panel = wxGetApp().sidebar();
if (!panel.IsFrozen()) {
panel.Freeze();
panel.Layout();
panel.Thaw();
}
}
});
}

1
src/slic3r/GUI/GUI_ObjectManipulation.hpp
View File

@ -169,6 +169,7 @@ private:
bool m_is_enabled { true };
bool m_is_enabled_size_and_scale { true };
bool m_show_skew { false };
public:
ObjectManipulation(wxWindow* parent);