juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 03:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: ComboBox set icon

Browse Source 
Change-Id: If74ccca3649913d8cf6664347d082f75e4425b00
Jira: STUDIO-8640
(cherry picked from commit 7ce090d2b5308650d5cb10f0dac021efa181214d)
This commit is contained in:
chunmao.guo
2024-11-06 12:32:10 +08:00
committed by Noisyfox
parent 038dd56006
commit d3a164251c
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/GUI/Widgets/ComboBox.cpp
View File

@@ -85,9 +85,12 @@ void ComboBox::SetSelection(int n)
return; return;
drop.SetSelection(n); drop.SetSelection(n);
SetLabel(drop.GetValue()); SetLabel(drop.GetValue());
if (drop.selection >= 0 && drop.iconSize.y > 0) if (drop.selection >= 0 && drop.iconSize.y > 0 && icons[drop.selection].IsOk())
SetIcon(icons[drop.selection].IsNull() ? create_scaled_bitmap("drop_down", nullptr, 16): icons[drop.selection]); // ORCA fix combo boxes without arrows SetIcon(icons[drop.selection]);
else
SetIcon("drop_down");
} }
void ComboBox::SelectAndNotify(int n) { void ComboBox::SelectAndNotify(int n) {
SetSelection(n); SetSelection(n);
sendComboBoxEvent(); sendComboBoxEvent();
@@ -108,8 +111,10 @@ void ComboBox::SetValue(const wxString &value)
{ {
drop.SetValue(value); drop.SetValue(value);
SetLabel(value); SetLabel(value);
if (drop.selection >= 0 && drop.iconSize.y > 0) if (drop.selection >= 0 && drop.iconSize.y > 0 && icons[drop.selection].IsOk())
SetIcon(icons[drop.selection].IsNull() ? create_scaled_bitmap("drop_down", nullptr, 16): icons[drop.selection]); // ORCA fix combo boxes without arrows SetIcon(icons[drop.selection]);
else
SetIcon("drop_down");
} }
void ComboBox::SetLabel(const wxString &value) void ComboBox::SetLabel(const wxString &value)

3
src/slic3r/GUI/Widgets/DropDown.cpp
View File

@@ -332,7 +332,8 @@ void DropDown::messureSize()
wxSize size1 = text_off ? wxSize() : dc.GetMultiLineTextExtent(texts[i]); wxSize size1 = text_off ? wxSize() : dc.GetMultiLineTextExtent(texts[i]);
if (icons[i].IsOk()) { if (icons[i].IsOk()) {
wxSize size2 = GetBmpSize(icons[i]); wxSize size2 = GetBmpSize(icons[i]);
if (size2.x > iconSize.x) iconSize = size2; if (size2.x > iconSize.x)
iconSize = size2;
if (!align_icon) { if (!align_icon) {
size1.x += size2.x + (text_off ? 0 : 5); size1.x += size2.x + (text_off ? 0 : 5);
} }