FIX: use scaled icon in MacOS

Change-Id: Ic7e89a3ff1dd92818adfcec410cc0bdcacfc0398
This commit is contained in:
chunmao.guo authored and Lane.Wei committed 2022-08-05 16:11:42 +08:00
1 parent 9f062905b2
commit 00ba515783
5 files changed
+13 -13

No files matched your search

+3 -3
View File
@@ -162,7 +162,7 @@ void Button::render(wxDC& dc)
//BBS norrow size between text and icon
szContent.x += padding;
}
szIcon = icon.bmp().GetSize();
szIcon = icon.GetBmpSize();
szContent.x += szIcon.x;
if (szIcon.y > szContent.y)
szContent.y = szIcon.y;
@@ -211,7 +211,7 @@ void Button::messureSize()
//BBS norrow size between text and icon
szContent.x += 5;
}
wxSize szIcon = this->active_icon.bmp().GetSize();
wxSize szIcon = this->active_icon.GetBmpSize();
szContent.x += szIcon.x;
if (szIcon.y > szContent.y)
szContent.y = szIcon.y;
@@ -246,4 +246,4 @@ void Button::sendButtonEvent()
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
}
}