3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-07 23:17:35 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'main' into feature/multitool

Browse source
This commit is contained in:
SoftFever 2024-07-23 18:21:19 +08:00 • committed by GitHub
commit ff10d5f661
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 111 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/Tab.cpp
View file

@ -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();