mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-08 23:46:24 -06:00
FIX:fixed display wrong color of the color picker button
Change-Id: I09f955545f5e1adf28842f51394ae63ec1fe3576
This commit is contained in:
parent
1e5c746429
commit
ee59ac76a9
2 changed files with 15 additions and 4 deletions
|
@ -64,7 +64,7 @@ void AMSMaterialsSetting::create()
|
||||||
m_clrData->SetChooseFull(true);
|
m_clrData->SetChooseFull(true);
|
||||||
m_clrData->SetChooseAlpha(false);
|
m_clrData->SetChooseAlpha(false);
|
||||||
|
|
||||||
m_clr_picker = new Button(this, "", "");
|
m_clr_picker = new Button(this, wxEmptyString, wxEmptyString, wxBU_AUTODRAW);
|
||||||
m_clr_picker->SetCanFocus(false);
|
m_clr_picker->SetCanFocus(false);
|
||||||
m_clr_picker->SetSize(FromDIP(50), FromDIP(25));
|
m_clr_picker->SetSize(FromDIP(50), FromDIP(25));
|
||||||
m_clr_picker->SetMinSize(wxSize(FromDIP(50), FromDIP(25)));
|
m_clr_picker->SetMinSize(wxSize(FromDIP(50), FromDIP(25)));
|
||||||
|
@ -364,7 +364,12 @@ void AMSMaterialsSetting::on_clr_picker(wxCommandEvent & event)
|
||||||
show_flag = true;
|
show_flag = true;
|
||||||
if (clr_dialog->ShowModal() == wxID_OK) {
|
if (clr_dialog->ShowModal() == wxID_OK) {
|
||||||
m_clrData = &(clr_dialog->GetColourData());
|
m_clrData = &(clr_dialog->GetColourData());
|
||||||
m_clr_picker->SetBackgroundColor(m_clrData->GetColour());
|
m_clr_picker->SetBackgroundColor(wxColour(
|
||||||
|
m_clrData->GetColour().Red(),
|
||||||
|
m_clrData->GetColour().Green(),
|
||||||
|
m_clrData->GetColour().Blue(),
|
||||||
|
254
|
||||||
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -374,13 +379,19 @@ bool AMSMaterialsSetting::Show(bool show)
|
||||||
m_button_confirm->SetMinSize(AMS_MATERIALS_SETTING_BUTTON_SIZE);
|
m_button_confirm->SetMinSize(AMS_MATERIALS_SETTING_BUTTON_SIZE);
|
||||||
m_input_nozzle_max->GetTextCtrl()->SetSize(wxSize(-1, FromDIP(20)));
|
m_input_nozzle_max->GetTextCtrl()->SetSize(wxSize(-1, FromDIP(20)));
|
||||||
m_input_nozzle_min->GetTextCtrl()->SetSize(wxSize(-1, FromDIP(20)));
|
m_input_nozzle_min->GetTextCtrl()->SetSize(wxSize(-1, FromDIP(20)));
|
||||||
|
m_clr_picker->SetBackgroundColour(m_clr_picker->GetParent()->GetBackgroundColour());
|
||||||
}
|
}
|
||||||
return DPIDialog::Show(show);
|
return DPIDialog::Show(show);
|
||||||
}
|
}
|
||||||
|
|
||||||
void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_min, wxString temp_max)
|
void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_min, wxString temp_max)
|
||||||
{
|
{
|
||||||
m_clr_picker->SetBackgroundColor(m_clrData->GetColour());
|
m_clr_picker->SetBackgroundColor(wxColour(
|
||||||
|
m_clrData->GetColour().Red(),
|
||||||
|
m_clrData->GetColour().Green(),
|
||||||
|
m_clrData->GetColour().Blue(),
|
||||||
|
254
|
||||||
|
));
|
||||||
|
|
||||||
if (!m_is_third) {
|
if (!m_is_third) {
|
||||||
m_button_confirm->Hide();
|
m_button_confirm->Hide();
|
||||||
|
|
|
@ -83,7 +83,7 @@ protected:
|
||||||
Button * m_button_confirm;
|
Button * m_button_confirm;
|
||||||
wxStaticText* m_tip_readonly;
|
wxStaticText* m_tip_readonly;
|
||||||
Button * m_button_close;
|
Button * m_button_close;
|
||||||
Button * m_clr_picker;
|
Button * m_clr_picker;
|
||||||
wxColourData * m_clrData;
|
wxColourData * m_clrData;
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
wxComboBox *m_comboBox_filament_mac;
|
wxComboBox *m_comboBox_filament_mac;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue