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

Deleted code related to mode sizer.

Browse Source
This commit is contained in:
YuSanka 2024-01-15 10:38:39 +01:00 committed by David Kocik
parent 30a1279d90
commit 1fdfbf3921
5 changed files with 0 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/slic3r/GUI/MainFrame.cpp
View File

@ -538,11 +538,6 @@ void MainFrame::update_layout()
}
}
#ifdef _MSW_DARK_MODE
// Sizer with buttons for mode changing
m_plater->sidebar().show_mode_sizer(wxGetApp().tabs_as_menu() || m_layout != ESettingsLayout::Old);
#endif
#ifdef __WXMSW__
if (update_scaling_state != State::noUpdate)
{
@ -586,10 +581,6 @@ void MainFrame::update_layout()
// m_tabpanel->SetMinSize(size);
// }
//#endif
#ifdef __APPLE__
m_plater->sidebar().change_top_border_for_mode_sizer(m_layout != ESettingsLayout::Old);
#endif
Layout();
Thaw();
@ -1178,9 +1169,6 @@ void MainFrame::update_mode_markers()
if (!wxGetApp().tabs_as_menu())
dynamic_cast<TopBar*>(m_tabpanel)->UpdateModeMarkers();
// update mode markers on side_bar
wxGetApp().sidebar().update_mode_markers();
// update mode markers in tabs
for (auto tab : wxGetApp().tabs_list)
tab->update_mode_markers();

32
src/slic3r/GUI/Sidebar.cpp
View File

@ -332,9 +332,6 @@ Sidebar::Sidebar(Plater *parent)
auto *scrolled_sizer = new wxBoxSizer(wxVERTICAL);
m_scrolled_panel->SetSizer(scrolled_sizer);
// Sizer with buttons for mode changing
m_mode_sizer = new ModeSizer(m_scrolled_panel, int(0.5 * wxGetApp().em_unit()));
// The preset chooser
m_presets_sizer = new wxFlexGridSizer(10, 1, 1, 2);
m_presets_sizer->AddGrowableCol(0, 1);
@ -438,10 +435,6 @@ Sidebar::Sidebar(Plater *parent)
m_object_info = new ObjectInfo(m_scrolled_panel);
m_sliced_info = new SlicedInfo(m_scrolled_panel);
// Sizer in the scrolled area
if (m_mode_sizer)
scrolled_sizer->Add(m_mode_sizer, 0, wxALIGN_CENTER_HORIZONTAL);
int size_margin = wxGTK3 ? wxLEFT | wxRIGHT : wxLEFT;
is_msw ?
@ -742,14 +735,6 @@ void Sidebar::on_select_preset(wxCommandEvent& evt)
#endif
}
void Sidebar::change_top_border_for_mode_sizer(bool increase_border)
{
if (m_mode_sizer) {
m_mode_sizer->set_items_flag(increase_border ? wxTOP : 0);
m_mode_sizer->set_items_border(increase_border ? int(0.5 * wxGetApp().em_unit()) : 0);
}
}
void Sidebar::update_reslice_btn_tooltip()
{
wxString tooltip = wxString("Slice") + " [" + GUI::shortkey_ctrl_prefix() + "R]";
@ -801,8 +786,6 @@ void Sidebar::sys_color_changed()
for (wxWindow* btn : std::vector<wxWindow*>{ m_btn_reslice, m_btn_export_gcode })
wxGetApp().UpdateDarkUI(btn, true);
if (m_mode_sizer)
m_mode_sizer->sys_color_changed();
m_frequently_changed_parameters->sys_color_changed();
m_object_settings ->sys_color_changed();
#endif
@ -828,12 +811,6 @@ void Sidebar::sys_color_changed()
m_scrolled_panel->Refresh();
}
void Sidebar::update_mode_markers()
{
if (m_mode_sizer)
m_mode_sizer->update_mode_markers();
}
ObjectManipulation* Sidebar::obj_manipul()
{
return m_object_manipulation.get();
@ -1109,8 +1086,6 @@ bool Sidebar::show_connect(bool show) const { return m_btn_connect_gcod
void Sidebar::update_mode()
{
m_mode = wxGetApp().get_mode();
if (m_mode_sizer)
m_mode_sizer->SetMode(m_mode);
update_reslice_btn_tooltip();
@ -1150,13 +1125,6 @@ void Sidebar::collapse(bool collapse)
wxGetApp().app_config->set("collapsed_sidebar", collapse ? "1" : "0");
}
#ifdef _MSW_DARK_MODE
void Sidebar::show_mode_sizer(bool show)
{
m_mode_sizer->Show(show);
}
#endif
void Sidebar::update_ui_from_settings()
{
m_object_manipulation->update_ui_from_settings();

7
src/slic3r/GUI/Sidebar.hpp
View File

@ -63,7 +63,6 @@ class Sidebar : public wxPanel
wxScrolledWindow* m_scrolled_panel { nullptr };
wxPanel* m_presets_panel { nullptr }; // Used for MSW better layouts
ModeSizer* m_mode_sizer { nullptr };
wxFlexGridSizer* m_presets_sizer { nullptr };
wxBoxSizer* m_filaments_sizer { nullptr };
@ -129,23 +128,17 @@ public:
bool show_connect(bool show) const;
void collapse(bool collapse);
void change_top_border_for_mode_sizer(bool increase_border);
void set_extruders_count(size_t extruders_count);
void update_mode();
void update_ui_from_settings();
void update_objects_list_extruder_column(size_t extruders_count);
void update_presets(Preset::Type preset_type);
void update_mode_markers();
void update_printer_presets_combobox();
void msw_rescale();
void sys_color_changed();
#ifdef _MSW_DARK_MODE
void show_mode_sizer(bool show);
#endif
bool is_collapsed{ false };
};

18
src/slic3r/GUI/Tab.cpp
View File

@ -262,14 +262,6 @@ void Tab::create_preset_tab()
m_top_hsizer->Add(m_h_buttons_sizer, 1, wxEXPAND);
m_top_hsizer->AddSpacer(int(16*scale_factor));
// StretchSpacer has a strange behavior under OSX, so
// There is used just additional sizer for m_mode_sizer with right alignment
if (m_mode_sizer) {
auto mode_sizer = new wxBoxSizer(wxVERTICAL);
// Don't set the 2nd parameter to 1, making the sizer rubbery scalable in Y axis may lead
// to wrong vertical size assigned to wxBitmapComboBoxes, see GH issue #7176.
mode_sizer->Add(m_mode_sizer, 0, wxALIGN_RIGHT);
m_top_hsizer->Add(mode_sizer, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, wxOSX ? 15 : 10);
}
// hide whole top sizer to correct layout later
m_top_hsizer->ShowItems(false);
@ -912,10 +904,6 @@ void Tab::update_mode()
{
m_mode = wxGetApp().get_mode();
// update mode for ModeSizer
if (m_mode_sizer)
m_mode_sizer->SetMode(m_mode);
update_visibility();
update_changed_tree_ui();
@ -923,10 +911,6 @@ void Tab::update_mode()
void Tab::update_mode_markers()
{
// update mode for ModeSizer
if (m_mode_sizer)
m_mode_sizer->update_mode_markers();
if (m_active_page)
m_active_page->refresh();
}
@ -991,8 +975,6 @@ void Tab::sys_color_changed()
update_label_colours();
#ifdef _WIN32
wxWindowUpdateLocker noUpdates(this);
if (m_mode_sizer)
m_mode_sizer->sys_color_changed();
wxGetApp().UpdateDarkUI(this);
wxGetApp().UpdateDarkUI(m_treectrl);
#endif

2
src/slic3r/GUI/Tab.hpp
View File

@ -199,8 +199,6 @@ protected:
wxScrolledWindow* m_page_view {nullptr};
wxBoxSizer* m_page_sizer {nullptr};
ModeSizer* m_mode_sizer {nullptr};
struct PresetDependencies {
Preset::Type type = Preset::TYPE_INVALID;
wxWindow *checkbox = nullptr;