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

FIX:fixed users can not click drop-down menu on mac

Browse source 
Change-Id: Ib9ac9e323d70f5be32a7d1bd935effba974ef006
This commit is contained in:
tao wang 2022-11-19 14:18:27 +08:00 • committed by Lane.Wei
parent 196f20fbc9
commit 01744f1759
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/slic3r/GUI/Widgets/SideButton.cpp
View file

@ -14,10 +14,17 @@ SideButton::SideButton(wxWindow* parent, wxString text, wxString icon, long stly
, state_handler(this) , state_handler(this)
{ {
radius = 12; radius = 12;
#ifdef __APPLE__
extra_size = wxSize(38 + FromDIP(20), 10);
text_margin = 15 + FromDIP(20);
#else
extra_size = wxSize(38, 10); extra_size = wxSize(38, 10);
text_margin = 15;
#endif
icon_offset = 0; icon_offset = 0;
text_orientation = HO_Left; text_orientation = HO_Left;
text_margin = 15;
border_color.append(0x6B6B6B, StateColor::Disabled); border_color.append(0x6B6B6B, StateColor::Disabled);

5
src/slic3r/GUI/Widgets/SideMenuPopup.cpp
View file

@ -50,6 +50,11 @@ void SidePopup::Popup(wxWindow* focus)
} }
if (focus) { if (focus) {
wxPoint pos = focus->ClientToScreen(wxPoint(0, -6)); wxPoint pos = focus->ClientToScreen(wxPoint(0, -6));
#ifdef __APPLE__
pos.x = pos.x - FromDIP(20);
#endif // __APPLE__
if (pos.x + max_width > screenwidth) if (pos.x + max_width > screenwidth)
Position({pos.x - (pos.x + max_width - screenwidth),pos.y}, {0, focus->GetSize().y + 12}); Position({pos.x - (pos.x + max_width - screenwidth),pos.y}, {0, focus->GetSize().y + 12});
else else