mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-17 02:22:17 +00:00
Merge branch 'main' into feature/multitool
This commit is contained in:
@@ -273,7 +273,7 @@ void Tab::create_preset_tab()
|
||||
//search input
|
||||
m_search_item = new StaticBox(m_top_panel);
|
||||
StateColor box_colour(std::pair<wxColour, int>(*wxWHITE, StateColor::Normal));
|
||||
StateColor box_border_colour(std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Normal));
|
||||
StateColor box_border_colour(std::pair<wxColour, int>(wxColour("#DBDBDB"), StateColor::Normal)); // ORCA match border color with other input/combo boxes
|
||||
|
||||
m_search_item->SetBackgroundColor(box_colour);
|
||||
m_search_item->SetBorderColor(box_border_colour);
|
||||
@@ -302,7 +302,7 @@ void Tab::create_preset_tab()
|
||||
if (m_presets_choice) m_presets_choice->Show();
|
||||
|
||||
m_btn_save_preset->Show();
|
||||
m_btn_delete_preset->Show(); // ORCA: fixes delete preset button visible while search box focused
|
||||
m_btn_delete_preset->Show(); // ORCA: fixes delete preset button visible while search box focused
|
||||
m_undo_btn->Show(); // ORCA: fixes revert preset button visible while search box focused
|
||||
m_btn_search->Show();
|
||||
m_search_item->Hide();
|
||||
@@ -332,7 +332,7 @@ void Tab::create_preset_tab()
|
||||
m_presets_choice->Hide();
|
||||
|
||||
m_btn_save_preset->Hide();
|
||||
m_btn_delete_preset->Hide(); // ORCA: fixes delete preset button visible while search box focused
|
||||
m_btn_delete_preset->Hide(); // ORCA: fixes delete preset button visible while search box focused
|
||||
m_undo_btn->Hide(); // ORCA: fixes revert preset button visible while search box focused
|
||||
m_btn_search->Hide();
|
||||
m_search_item->Show();
|
||||
|
||||
Reference in New Issue
Block a user