mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-27 10:51:22 +00:00
Merge branch 'main' into dev/extruder-toggle
This commit is contained in:
@@ -146,7 +146,6 @@ protected:
|
||||
|
||||
//BBS: GUI refactor
|
||||
wxPanel* m_top_panel;
|
||||
ScalableButton* m_mode_icon; // ORCA m_static_title replacement
|
||||
wxBoxSizer* m_main_sizer;
|
||||
wxBoxSizer* m_top_sizer;
|
||||
wxBoxSizer* m_top_left_sizer;
|
||||
@@ -308,6 +307,7 @@ public:
|
||||
int m_update_cnt = 0;
|
||||
|
||||
ModeSwitchButton *m_mode_view = nullptr;
|
||||
ScalableButton* m_mode_icon = nullptr; // ORCA m_static_title replacement
|
||||
wxSizer * m_variant_sizer = nullptr;
|
||||
MultiSwitchButton * m_extruder_switch = nullptr;
|
||||
MultiSwitchButton * m_variant_combo = nullptr;
|
||||
|
||||
Reference in New Issue
Block a user