mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-08-02 07:42:14 +00:00
init
This commit is contained in:
@@ -548,7 +548,7 @@ void RemoveButtonBorder(wxWindow* win)
|
|||||||
GtkCssProvider* provider = gtk_css_provider_new();
|
GtkCssProvider* provider = gtk_css_provider_new();
|
||||||
|
|
||||||
const char* css =
|
const char* css =
|
||||||
"button {"
|
"button, button:hover, button:active, button:focus {"
|
||||||
" border: none;"
|
" border: none;"
|
||||||
" outline: none;"
|
" outline: none;"
|
||||||
" box-shadow: none;"
|
" box-shadow: none;"
|
||||||
|
|||||||
@@ -865,6 +865,9 @@ PlaterPresetComboBox::PlaterPresetComboBox(wxWindow *parent, Preset::Type preset
|
|||||||
clr_picker = new wxBitmapButton(parent, wxID_ANY, {}, wxDefaultPosition, wxSize(FromDIP(20), FromDIP(20)), wxBU_EXACTFIT | wxBU_AUTODRAW | wxBORDER_NONE);
|
clr_picker = new wxBitmapButton(parent, wxID_ANY, {}, wxDefaultPosition, wxSize(FromDIP(20), FromDIP(20)), wxBU_EXACTFIT | wxBU_AUTODRAW | wxBORDER_NONE);
|
||||||
clr_picker->SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE));
|
clr_picker->SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE));
|
||||||
clr_picker->SetToolTip(_L("Click to select filament color"));
|
clr_picker->SetToolTip(_L("Click to select filament color"));
|
||||||
|
#ifdef __WXGTK__
|
||||||
|
RemoveButtonBorder(clr_picker);
|
||||||
|
#endif
|
||||||
clr_picker->Bind(wxEVT_BUTTON, [this](wxCommandEvent& e) {
|
clr_picker->Bind(wxEVT_BUTTON, [this](wxCommandEvent& e) {
|
||||||
// Check if it's an official filament
|
// Check if it's an official filament
|
||||||
auto fila_type = Preset::remove_suffix_modified(GetValue().ToUTF8().data());
|
auto fila_type = Preset::remove_suffix_modified(GetValue().ToUTF8().data());
|
||||||
|
|||||||
@@ -1022,6 +1022,10 @@ ScalableButton::ScalableButton( wxWindow * parent,
|
|||||||
m_width = size.x * 10 / em;
|
m_width = size.x * 10 / em;
|
||||||
m_height= size.y * 10 / em;
|
m_height= size.y * 10 / em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef __WXGTK__
|
||||||
|
Slic3r::GUI::RemoveButtonBorder(this);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user