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

Dim the icon on ComboBox when disabled

Browse source
This commit is contained in:
Ocraftyone 2023-11-21 06:50:18 -05:00
parent 53bc949580
commit bc21ab61f5
No known key found for this signature in database
GPG key ID: 85836ED21AD4D125
3 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/slic3r/GUI/Widgets/ComboBox.cpp
View file

@ -98,6 +98,13 @@ void ComboBox::Rescale()
drop.Rescale(); drop.Rescale();
} }
bool ComboBox::Enable(bool enable) {
bool ret = TextInput::Enable(enable);
if (ret && icons[drop.selection].IsOk())
SetIcon(icons[drop.selection]);
return ret;
}
wxString ComboBox::GetValue() const wxString ComboBox::GetValue() const
{ {
return drop.GetSelection() >= 0 ? drop.GetValue() : GetLabel(); return drop.GetSelection() >= 0 ? drop.GetValue() : GetLabel();
@ -145,6 +152,10 @@ bool ComboBox::SetFont(wxFont const& font)
return TextInput::SetFont(font); return TextInput::SetFont(font);
} }
void ComboBox::SetIcon(const wxBitmapBundle &icon) {
TextInput::SetIcon(m_isEnabled ? icon : icon.GetBitmapFor(this).ConvertToDisabled(128));
}
int ComboBox::Append(const wxString &item, const wxBitmapBundle &bitmap) int ComboBox::Append(const wxString &item, const wxBitmapBundle &bitmap)
{ {
return Append(item, bitmap, nullptr); return Append(item, bitmap, nullptr);

3
src/slic3r/GUI/Widgets/ComboBox.hpp
View file

@ -17,6 +17,7 @@ class ComboBox : public wxWindowWithItems<TextInput, wxItemContainer>
DropDown drop; DropDown drop;
bool drop_down = false; bool drop_down = false;
bool text_off = false; bool text_off = false;
bool m_is_enabled = true;
public: public:
ComboBox(wxWindow * parent, ComboBox(wxWindow * parent,
@ -62,6 +63,8 @@ public:
void SetItemBitmap(unsigned int n, wxBitmapBundle const &bitmap); void SetItemBitmap(unsigned int n, wxBitmapBundle const &bitmap);
void ToggleDropDown(); void ToggleDropDown();
bool Enable(bool enable = true) override;
void SetIcon(const wxBitmapBundle &icon) override;
protected: protected:
virtual int DoInsertItems(const wxArrayStringsAdapter &items, virtual int DoInsertItems(const wxArrayStringsAdapter &items,

2
src/slic3r/GUI/Widgets/TextInput.hpp
View file

@ -40,7 +40,7 @@ public:
void SetLabel(const wxString& label); void SetLabel(const wxString& label);
void SetIcon(const wxBitmapBundle & icon); virtual void SetIcon(const wxBitmapBundle & icon);
void SetLabelColor(StateColor const &color); void SetLabelColor(StateColor const &color);