GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-30 03:42:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Preferences: Fixes invalidation of the m_settings_layout_changed flag.

Browse Source 
+ TopBar: Fixed margins for Settings button and refresh of the PopupButtons
This commit is contained in:
YuSanka 2024-07-18 15:11:34 +02:00 committed by Lukas Matena
parent f004f815ce
commit 795c3a7dd6
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/Preferences.cpp
View File

@ -158,6 +158,9 @@ void PreferencesDialog::show(const std::string& highlight_opt_key /*= std::strin
update_color(color_pickres[mode], palette[mode]); update_color(color_pickres[mode], palette[mode]);
} }
// invalidate this flag before show preferences
m_settings_layout_changed = false;
this->ShowModal(); this->ShowModal();
} }
@ -787,7 +790,6 @@ void PreferencesDialog::accept(wxEvent&)
if (auto it = m_values.find("seq_top_layer_only"); it != m_values.end()) if (auto it = m_values.find("seq_top_layer_only"); it != m_values.end())
m_seq_top_layer_only_changed = app_config->get("seq_top_layer_only") != it->second; m_seq_top_layer_only_changed = app_config->get("seq_top_layer_only") != it->second;
m_settings_layout_changed = false;
for (const std::string& key : { "old_settings_layout_mode", for (const std::string& key : { "old_settings_layout_mode",
"dlg_settings_layout_mode" }) "dlg_settings_layout_mode" })
{ {

3
src/slic3r/GUI/TopBar.cpp
View File

@ -204,6 +204,7 @@ void TopBarItemsCtrl::ButtonWithPopup::SetLabel(const wxString& label)
} }
m_label = text; m_label = text;
Refresh();
GetParent()->Layout(); GetParent()->Layout();
} }
@ -421,7 +422,7 @@ TopBarItemsCtrl::TopBarItemsCtrl(wxWindow *parent, TopBarMenus* menus/* = nullpt
if (m_cb_settings_btn) { if (m_cb_settings_btn) {
m_settings_btn = new Button(this, _L("Settings"/*, "settings"*/)); m_settings_btn = new Button(this, _L("Settings"/*, "settings"*/));
m_settings_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent& event) { m_cb_settings_btn(); }); m_settings_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent& event) { m_cb_settings_btn(); });
left_sizer->Add(m_settings_btn, 0, wxALIGN_CENTER_VERTICAL); left_sizer->Add(m_settings_btn, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, m_btn_margin);
} }
m_buttons_sizer = new wxFlexGridSizer(1, m_btn_margin, m_btn_margin); m_buttons_sizer = new wxFlexGridSizer(1, m_btn_margin, m_btn_margin);