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

FIX:changed top menu bar color on macos

Browse source 
Change-Id: I276aab27c2c089ad322dc5cb2f6206dccb3e494d
This commit is contained in:
tao wang 2022-12-10 15:15:56 +08:00 • committed by Lane.Wei
parent 9ab6e86b47
commit 5c3c2fcb1c
3 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/slic3r/GUI/Notebook.cpp
View file

@ -20,7 +20,15 @@ ButtonsListCtrl::ButtonsListCtrl(wxWindow *parent, wxBoxSizer* side_tools) :
#ifdef __WINDOWS__ #ifdef __WINDOWS__
SetDoubleBuffered(true); SetDoubleBuffered(true);
#endif //__WINDOWS__ #endif //__WINDOWS__
wxColour default_btn_bg = wxColour("#3B4446"); // Gradient #414B4E
wxColour default_btn_bg;
#ifdef __APPLE__
default_btn_bg = wxColour("#3B4446"); // Gradient #414B4E
#else
default_btn_bg = wxColour("#2D2D30"); // Gradient #414B4E
#endif
SetBackgroundColour(default_btn_bg); SetBackgroundColour(default_btn_bg);
int em = em_unit(this);// Slic3r::GUI::wxGetApp().em_unit(); int em = em_unit(this);// Slic3r::GUI::wxGetApp().em_unit();

3
src/slic3r/GUI/UpgradePanel.cpp
View file

@ -969,7 +969,10 @@ void UpgradePanel::show_status(int status)
void UpgradePanel::on_sys_color_changed() void UpgradePanel::on_sys_color_changed()
{ {
//add some protection for Dark mode
if (m_push_upgrade_panel) {
m_push_upgrade_panel->on_sys_color_changed(); m_push_upgrade_panel->on_sys_color_changed();
}
} }
bool UpgradePanel::Show(bool show) bool UpgradePanel::Show(bool show)

6
src/slic3r/Utils/MacDarkMode.mm
View file

@ -44,9 +44,9 @@ double mac_max_scaling_factor()
void set_miniaturizable(void * window) void set_miniaturizable(void * window)
{ {
CGFloat rFloat = 38/255.0; CGFloat rFloat = 34/255.0;
CGFloat gFloat = 46/255.0; CGFloat gFloat = 34/255.0;
CGFloat bFloat = 48/255.0; CGFloat bFloat = 36/255.0;
[(NSView*) window window].titlebarAppearsTransparent = true; [(NSView*) window window].titlebarAppearsTransparent = true;
[(NSView*) window window].backgroundColor = [NSColor colorWithCalibratedRed:rFloat green:gFloat blue:bFloat alpha:1.0]; [(NSView*) window window].backgroundColor = [NSColor colorWithCalibratedRed:rFloat green:gFloat blue:bFloat alpha:1.0];
[(NSView*) window window].styleMask |= NSMiniaturizableWindowMask; [(NSView*) window window].styleMask |= NSMiniaturizableWindowMask;