From 618aebfb79965b8e475e37dc214449c7848d64e5 Mon Sep 17 00:00:00 2001 From: "liz.li" Date: Wed, 10 Aug 2022 12:31:55 +0800 Subject: [PATCH] FIX:adjust rounding of some buttons Change-Id: I8d1ed2b3d352689ea99fe00f26e405cc63151073 --- src/slic3r/GUI/Auxiliary.cpp | 2 +- src/slic3r/GUI/BBLStatusBarSend.cpp | 2 +- src/slic3r/GUI/BindDialog.cpp | 16 ++++++++-------- src/slic3r/GUI/MediaFilePanel.cpp | 2 +- src/slic3r/GUI/Monitor.cpp | 4 ++-- src/slic3r/GUI/MsgDialog.cpp | 2 +- src/slic3r/GUI/ParamsPanel.cpp | 2 +- src/slic3r/GUI/Plater.cpp | 4 ++-- src/slic3r/GUI/ReleaseNote.cpp | 2 ++ src/slic3r/GUI/SavePresetDialog.cpp | 4 ++-- src/slic3r/GUI/SelectMachine.cpp | 8 ++++---- src/slic3r/GUI/StatusPanel.cpp | 4 ++-- src/slic3r/GUI/UnsavedChangesDialog.cpp | 2 +- src/slic3r/GUI/Widgets/AMSControl.cpp | 10 +++++----- src/slic3r/GUI/Widgets/ProgressDialog.cpp | 1 + src/slic3r/GUI/WipeTowerDialog.cpp | 6 +++--- 16 files changed, 37 insertions(+), 34 deletions(-) diff --git a/src/slic3r/GUI/Auxiliary.cpp b/src/slic3r/GUI/Auxiliary.cpp index fb49f4a98..73d5baa94 100644 --- a/src/slic3r/GUI/Auxiliary.cpp +++ b/src/slic3r/GUI/Auxiliary.cpp @@ -502,7 +502,7 @@ AuFolderPanel::AuFolderPanel(wxWindow *parent, AuxiliaryFolderType type, wxWindo m_button_add->SetBackgroundColor(btn_bg_white); m_button_add->SetBorderColor(btn_bd_white); m_button_add->SetMinSize(wxSize(-1, FromDIP(24))); - m_button_add->SetCornerRadius(12); + m_button_add->SetCornerRadius(FromDIP(12)); m_button_add->SetFont(Label::Body_14); // m_button_add->Bind(wxEVT_LEFT_UP, &AuxiliaryPanel::on_add, this); diff --git a/src/slic3r/GUI/BBLStatusBarSend.cpp b/src/slic3r/GUI/BBLStatusBarSend.cpp index f73c1c540..5d9eab137 100644 --- a/src/slic3r/GUI/BBLStatusBarSend.cpp +++ b/src/slic3r/GUI/BBLStatusBarSend.cpp @@ -46,7 +46,7 @@ BBLStatusBarSend::BBLStatusBarSend(wxWindow *parent, int id) m_cancelbutton->SetMinSize(wxSize(m_self->FromDIP(64), m_self->FromDIP(24))); m_cancelbutton->SetTextColor(wxColour(107, 107, 107)); m_cancelbutton->SetBackgroundColor(wxColour(255, 255, 255)); - m_cancelbutton->SetCornerRadius(12); + m_cancelbutton->SetCornerRadius(m_self->FromDIP(12)); m_cancelbutton->Bind(wxEVT_BUTTON, [this](wxCommandEvent &evt) { m_was_cancelled = true; diff --git a/src/slic3r/GUI/BindDialog.cpp b/src/slic3r/GUI/BindDialog.cpp index b47a7a013..630ced8e9 100644 --- a/src/slic3r/GUI/BindDialog.cpp +++ b/src/slic3r/GUI/BindDialog.cpp @@ -32,7 +32,7 @@ namespace GUI { m_panel_left = new StaticBox(this, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(201), FromDIP(212)), wxBORDER_NONE); m_panel_left->SetMinSize(wxSize(FromDIP(201), FromDIP(212))); - m_panel_left->SetCornerRadius(8); + m_panel_left->SetCornerRadius(FromDIP(8)); m_panel_left->SetBackgroundColor(BIND_DIALOG_GREY200); wxBoxSizer *m_sizere_left_h = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *m_sizere_left_v= new wxBoxSizer(wxVERTICAL); @@ -55,7 +55,7 @@ namespace GUI { m_panel_right = new StaticBox(this, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(201), FromDIP(212)), wxBORDER_NONE); m_panel_right->SetMinSize(wxSize(FromDIP(201), FromDIP(212))); - m_panel_right->SetCornerRadius(8); + m_panel_right->SetCornerRadius(FromDIP(8)); m_panel_right->SetBackgroundColor(BIND_DIALOG_GREY200); m_user_name = new wxStaticText(m_panel_right, wxID_ANY, wxEmptyString); @@ -136,7 +136,7 @@ namespace GUI { m_button_bind->SetTextColor(*wxWHITE); m_button_bind->SetSize(BIND_DIALOG_BUTTON_SIZE); m_button_bind->SetMinSize(BIND_DIALOG_BUTTON_SIZE); - m_button_bind->SetCornerRadius(10); + m_button_bind->SetCornerRadius(FromDIP(12)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Hovered), @@ -148,7 +148,7 @@ namespace GUI { m_button_cancel->SetSize(BIND_DIALOG_BUTTON_SIZE); m_button_cancel->SetMinSize(BIND_DIALOG_BUTTON_SIZE); m_button_cancel->SetTextColor(BIND_DIALOG_GREY900); - m_button_cancel->SetCornerRadius(10); + m_button_cancel->SetCornerRadius(FromDIP(12)); m_sizer_button->Add(m_button_bind, 0, wxALIGN_CENTER, 0); m_sizer_button->Add(0, 0, 0, wxLEFT, FromDIP(13)); @@ -273,7 +273,7 @@ UnBindMachineDilaog::UnBindMachineDilaog(Plater *plater /*= nullptr*/) auto m_panel_left = new StaticBox(this, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(201), FromDIP(212)), wxBORDER_NONE); m_panel_left->SetMinSize(wxSize(FromDIP(201), FromDIP(212))); - m_panel_left->SetCornerRadius(8); + m_panel_left->SetCornerRadius(FromDIP(8)); m_panel_left->SetBackgroundColor(BIND_DIALOG_GREY200); wxBoxSizer *m_sizere_left_h = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *m_sizere_left_v= new wxBoxSizer(wxVERTICAL); @@ -297,7 +297,7 @@ UnBindMachineDilaog::UnBindMachineDilaog(Plater *plater /*= nullptr*/) auto m_panel_right = new StaticBox(this, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(201), FromDIP(212)), wxBORDER_NONE); m_panel_right->SetMinSize(wxSize(FromDIP(201), FromDIP(212))); - m_panel_right->SetCornerRadius(8); + m_panel_right->SetCornerRadius(FromDIP(8)); m_panel_right->SetBackgroundColor(BIND_DIALOG_GREY200); m_user_name = new wxStaticText(m_panel_right, wxID_ANY, wxEmptyString); m_user_name->SetBackgroundColour(BIND_DIALOG_GREY200); @@ -374,7 +374,7 @@ UnBindMachineDilaog::UnBindMachineDilaog(Plater *plater /*= nullptr*/) m_button_unbind->SetTextColor(*wxWHITE); m_button_unbind->SetSize(BIND_DIALOG_BUTTON_SIZE); m_button_unbind->SetMinSize(BIND_DIALOG_BUTTON_SIZE); - m_button_unbind->SetCornerRadius(10); + m_button_unbind->SetCornerRadius(FromDIP(12)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Hovered), @@ -386,7 +386,7 @@ UnBindMachineDilaog::UnBindMachineDilaog(Plater *plater /*= nullptr*/) m_button_cancel->SetSize(BIND_DIALOG_BUTTON_SIZE); m_button_cancel->SetMinSize(BIND_DIALOG_BUTTON_SIZE); m_button_cancel->SetTextColor(BIND_DIALOG_GREY900); - m_button_cancel->SetCornerRadius(10); + m_button_cancel->SetCornerRadius(FromDIP(12)); m_sizer_button->Add(m_button_unbind, 0, wxALIGN_CENTER, 0); m_sizer_button->Add(0, 0, 0, wxLEFT, FromDIP(13)); diff --git a/src/slic3r/GUI/MediaFilePanel.cpp b/src/slic3r/GUI/MediaFilePanel.cpp index a6f1e81d4..5c8f1a42d 100644 --- a/src/slic3r/GUI/MediaFilePanel.cpp +++ b/src/slic3r/GUI/MediaFilePanel.cpp @@ -50,7 +50,7 @@ MediaFilePanel::MediaFilePanel(wxWindow * parent) // File type m_type_panel = new ::StaticBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE); m_type_panel->SetBackgroundColor(*wxWHITE); - m_type_panel->SetCornerRadius(5); + m_type_panel->SetCornerRadius(FromDIP(5)); m_type_panel->SetMinSize({-1, 48 * em_unit(this) / 10}); m_button_timelapse = new ::Button(m_type_panel, _L("Timelapse"), "", wxBORDER_NONE); m_button_video = new ::Button(m_type_panel, _L("Video"), "", wxBORDER_NONE); diff --git a/src/slic3r/GUI/Monitor.cpp b/src/slic3r/GUI/Monitor.cpp index 4bf35132f..d39fa897c 100644 --- a/src/slic3r/GUI/Monitor.cpp +++ b/src/slic3r/GUI/Monitor.cpp @@ -52,8 +52,8 @@ AddMachinePanel::AddMachinePanel(wxWindow* parent, wxWindowID id, const wxPoint& horiz_sizer->Add(0, 0, 538, 0, 0); wxBoxSizer* btn_sizer = new wxBoxSizer(wxVERTICAL); - m_button_add_machine = new Button(this, "", "monitor_add_machine", FromDIP(23)); - m_button_add_machine->SetCornerRadius(10); + m_button_add_machine = new Button(this, "", "monitor_add_machine", FromDIP(24)); + m_button_add_machine->SetCornerRadius(FromDIP(12)); StateColor button_bg( std::pair(0xCECECE, StateColor::Pressed), std::pair(0xCECECE, StateColor::Hovered), diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp index 7cee03e5d..ad1b8e153 100644 --- a/src/slic3r/GUI/MsgDialog.cpp +++ b/src/slic3r/GUI/MsgDialog.cpp @@ -119,7 +119,7 @@ Button* MsgDialog::add_button(wxWindowID btn_id, bool set_focus /*= false*/, con btn->SetMinSize(MSG_DIALOG_LONG_BUTTON_SIZE); } - btn->SetCornerRadius(12); + btn->SetCornerRadius(FromDIP(12)); StateColor btn_bg_green( std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), diff --git a/src/slic3r/GUI/ParamsPanel.cpp b/src/slic3r/GUI/ParamsPanel.cpp index 8f1c3ac01..ed1d4a718 100644 --- a/src/slic3r/GUI/ParamsPanel.cpp +++ b/src/slic3r/GUI/ParamsPanel.cpp @@ -67,7 +67,7 @@ TipsDialog::TipsDialog(wxWindow *parent, const wxString &title) m_confirm->SetTextColor(wxColour(255, 255, 255)); m_confirm->SetSize(TIPS_DIALOG_BUTTON_SIZE); m_confirm->SetMinSize(TIPS_DIALOG_BUTTON_SIZE); - m_confirm->SetCornerRadius(12); + m_confirm->SetCornerRadius(FromDIP(12)); m_confirm->Bind(wxEVT_LEFT_DOWN, &TipsDialog::on_ok, this); m_sizer_right->Add(m_confirm, 0, wxALL, FromDIP(5)); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 394c57e39..721cb0bcf 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -6968,7 +6968,7 @@ ProjectDropDialog::ProjectDropDialog(const std::string &filename) m_confirm->SetTextColor(wxColour(255, 255, 255)); m_confirm->SetSize(PROJECT_DROP_DIALOG_BUTTON_SIZE); m_confirm->SetMinSize(PROJECT_DROP_DIALOG_BUTTON_SIZE); - m_confirm->SetCornerRadius(12); + m_confirm->SetCornerRadius(FromDIP(12)); m_confirm->Bind(wxEVT_LEFT_DOWN, &ProjectDropDialog::on_select_ok, this); m_sizer_right->Add(m_confirm, 0, wxALL, 5); @@ -6976,7 +6976,7 @@ ProjectDropDialog::ProjectDropDialog(const std::string &filename) m_cancel->SetTextColor(wxColour(107, 107, 107)); m_cancel->SetSize(PROJECT_DROP_DIALOG_BUTTON_SIZE); m_cancel->SetMinSize(PROJECT_DROP_DIALOG_BUTTON_SIZE); - m_cancel->SetCornerRadius(12); + m_cancel->SetCornerRadius(FromDIP(12)); m_cancel->Bind(wxEVT_LEFT_DOWN, &ProjectDropDialog::on_select_cancel, this); m_sizer_right->Add(m_cancel, 0, wxALL, 5); diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index e363323bd..7116995a0 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -147,6 +147,7 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent) m_butto_ok->SetFont(Label::Body_12); m_butto_ok->SetSize(wxSize(FromDIP(58), FromDIP(24))); m_butto_ok->SetMinSize(wxSize(FromDIP(58), FromDIP(24))); + m_butto_ok->SetCornerRadius(FromDIP(12)); m_butto_ok->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) { EndModal(wxID_YES); @@ -158,6 +159,7 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent) m_button_cancel->SetFont(Label::Body_12); m_button_cancel->SetSize(wxSize(FromDIP(58), FromDIP(24))); m_button_cancel->SetMinSize(wxSize(FromDIP(58), FromDIP(24))); + m_button_cancel->SetCornerRadius(FromDIP(12)); m_button_cancel->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) { EndModal(wxID_NO); diff --git a/src/slic3r/GUI/SavePresetDialog.cpp b/src/slic3r/GUI/SavePresetDialog.cpp index 3f5822c7e..71d594a25 100644 --- a/src/slic3r/GUI/SavePresetDialog.cpp +++ b/src/slic3r/GUI/SavePresetDialog.cpp @@ -339,7 +339,7 @@ void SavePresetDialog::build(std::vector types, std::string suffix m_confirm->SetBorderColor(wxColour(0, 174, 66)); m_confirm->SetTextColor(wxColour(255, 255, 255)); m_confirm->SetMinSize(SAVE_PRESET_DIALOG_BUTTON_SIZE); - m_confirm->SetCornerRadius(12); + m_confirm->SetCornerRadius(FromDIP(12)); m_confirm->Bind(wxEVT_BUTTON, &SavePresetDialog::accept, this); btns->Add(m_confirm, 0, wxEXPAND, 0); @@ -350,7 +350,7 @@ void SavePresetDialog::build(std::vector types, std::string suffix m_cancel = new Button(this, _L("Cancel")); m_cancel->SetMinSize(SAVE_PRESET_DIALOG_BUTTON_SIZE); m_cancel->SetTextColor(wxColour(107, 107, 107)); - m_cancel->SetCornerRadius(12); + m_cancel->SetCornerRadius(FromDIP(12)); m_cancel->Bind(wxEVT_BUTTON, &SavePresetDialog::on_select_cancel, this); btns->Add(m_cancel, 0, wxEXPAND, 0); diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 42b1bb8c7..86502c916 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -899,7 +899,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) m_button_ensure->SetTextColor(*wxWHITE); m_button_ensure->SetSize(SELECT_MACHINE_DIALOG_BUTTON_SIZE); m_button_ensure->SetMinSize(SELECT_MACHINE_DIALOG_BUTTON_SIZE); - m_button_ensure->SetCornerRadius(FromDIP(10)); + m_button_ensure->SetCornerRadius(FromDIP(12)); m_button_ensure->Bind(wxEVT_BUTTON, &SelectMachineDialog::on_ok, this); m_sizer_pcont->Add(m_button_ensure, 0, wxEXPAND | wxBOTTOM, FromDIP(10)); @@ -1956,9 +1956,9 @@ void SelectMachineDialog::Enable_Send_Button(bool en) void SelectMachineDialog::on_dpi_changed(const wxRect &suggested_rect) { m_button_refresh->SetMinSize(SELECT_MACHINE_DIALOG_BUTTON_SIZE); - m_button_refresh->SetCornerRadius(FromDIP(10)); + m_button_refresh->SetCornerRadius(FromDIP(12)); m_button_ensure->SetMinSize(SELECT_MACHINE_DIALOG_BUTTON_SIZE); - m_button_ensure->SetCornerRadius(FromDIP(10)); + m_button_ensure->SetCornerRadius(FromDIP(12)); m_status_bar->msw_rescale(); Fit(); Refresh(); @@ -2214,7 +2214,7 @@ EditDevNameDialog::EditDevNameDialog(Plater *plater /*= nullptr*/) m_button_confirm->SetTextColor(wxColour(255, 255, 255)); m_button_confirm->SetSize(wxSize(FromDIP(72), FromDIP(24))); m_button_confirm->SetMinSize(wxSize(FromDIP(72), FromDIP(24))); - m_button_confirm->SetCornerRadius(12); + m_button_confirm->SetCornerRadius(FromDIP(12)); m_button_confirm->Bind(wxEVT_BUTTON, &EditDevNameDialog::on_edit_name, this); m_sizer_main->Add(m_button_confirm, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, FromDIP(10)); diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 0ae53b14a..0676c4319 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -857,7 +857,7 @@ wxBoxSizer *StatusBasePanel::create_extruder_control(wxWindow *parent) m_button_unload->SetTextColor(abort_text); m_button_unload->SetFont(Label::Body_10); m_button_unload->SetMinSize(wxSize(-1, FromDIP(24))); - m_button_unload->SetCornerRadius(FromDIP(10)); + m_button_unload->SetCornerRadius(FromDIP(12)); bSizer_e_ctrl->Add(0, 0, 1, wxEXPAND, 0); bSizer_e_ctrl->Add(m_button_unload, 0, wxALIGN_CENTER_HORIZONTAL| wxTOP|wxBOTTOM, FromDIP(5)); @@ -1066,7 +1066,7 @@ void StatusPanel::init_scaled_buttons() m_button_clean->SetMinSize(wxSize(FromDIP(48), FromDIP(24))); m_button_clean->SetCornerRadius(FromDIP(12)); m_button_unload->SetMinSize(wxSize(-1, FromDIP(24))); - m_button_unload->SetCornerRadius(FromDIP(10)); + m_button_unload->SetCornerRadius(FromDIP(12)); m_bpButton_z_10->SetMinSize(Z_BUTTON_SIZE); m_bpButton_z_10->SetCornerRadius(0); m_bpButton_z_1->SetMinSize(Z_BUTTON_SIZE); diff --git a/src/slic3r/GUI/UnsavedChangesDialog.cpp b/src/slic3r/GUI/UnsavedChangesDialog.cpp index a54810e7c..04382ec14 100644 --- a/src/slic3r/GUI/UnsavedChangesDialog.cpp +++ b/src/slic3r/GUI/UnsavedChangesDialog.cpp @@ -953,7 +953,7 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_ } (*btn)->SetMinSize(UNSAVE_CHANGE_DIALOG_BUTTON_SIZE); - (*btn)->SetCornerRadius(12); + (*btn)->SetCornerRadius(FromDIP(12)); (*btn)->Bind(wxEVT_BUTTON, [this, close_act, dependent_presets](wxEvent &) { bool save_names_and_types = close_act == Action::Save || (close_act == Action::Transfer && ActionButtons::KEEP & m_buttons); diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index a1e52f50f..dbe74760d 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -1345,7 +1345,7 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons m_panel_can = new StaticBox(amswin, wxID_ANY, wxDefaultPosition, AMS_CANS_SIZE, wxBORDER_NONE); m_panel_can->SetMinSize(AMS_CANS_SIZE); - m_panel_can->SetCornerRadius(10); + m_panel_can->SetCornerRadius(FromDIP(10)); m_panel_can->SetBackgroundColor(AMS_CONTROL_DEF_BLOCK_BK_COLOUR); m_sizer_cans = new wxBoxSizer(wxHORIZONTAL); @@ -1532,7 +1532,7 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons m_button_calibration_again->SetBorderColor(AMS_CONTROL_BRAND_COLOUR); m_button_calibration_again->SetTextColor(AMS_CONTROL_WHITE_COLOUR); m_button_calibration_again->SetMinSize(AMS_CONTRO_CALIBRATION_BUTTON_SIZE); - m_button_calibration_again->SetCornerRadius(12); + m_button_calibration_again->SetCornerRadius(FromDIP(12)); m_button_calibration_again->Bind(wxEVT_LEFT_DOWN, &AMSControl::on_clibration_again_click, this); sizer_button->Add(m_button_calibration_again, 0, wxALL, 5); @@ -1542,7 +1542,7 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons m_button_calibration_cancel->SetBorderColor(AMS_CONTROL_GRAY700); m_button_calibration_cancel->SetTextColor(AMS_CONTROL_GRAY800); m_button_calibration_cancel->SetMinSize(AMS_CONTRO_CALIBRATION_BUTTON_SIZE); - m_button_calibration_cancel->SetCornerRadius(12); + m_button_calibration_cancel->SetCornerRadius(FromDIP(12)); m_button_calibration_cancel->Bind(wxEVT_LEFT_DOWN, &AMSControl::on_clibration_cancel_click, this); sizer_button->Add(m_button_calibration_cancel, 0, wxALL, 5); @@ -1575,9 +1575,9 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons void AMSControl::init_scaled_buttons() { m_button_extruder_feed->SetMinSize(wxSize(-1, FromDIP(24))); - m_button_extruder_feed->SetCornerRadius(FromDIP(11)); + m_button_extruder_feed->SetCornerRadius(FromDIP(12)); m_button_extruder_back->SetMinSize(wxSize(-1, FromDIP(24))); - m_button_extruder_back->SetCornerRadius(FromDIP(11)); + m_button_extruder_back->SetCornerRadius(FromDIP(12)); m_button_ams_setting->SetMinSize(wxSize(-1, FromDIP(33))); m_button_ams_setting->SetCornerRadius(FromDIP(12)); } diff --git a/src/slic3r/GUI/Widgets/ProgressDialog.cpp b/src/slic3r/GUI/Widgets/ProgressDialog.cpp index 45dfc4971..e6860504e 100644 --- a/src/slic3r/GUI/Widgets/ProgressDialog.cpp +++ b/src/slic3r/GUI/Widgets/ProgressDialog.cpp @@ -221,6 +221,7 @@ bool ProgressDialog::Create(const wxString &title, const wxString &message, int m_button_cancel = new Button(this, _L("Cancel")); m_button_cancel->SetTextColor(PROGRESSDIALOG_GREY_700); m_button_cancel->SetMinSize(PROGRESSDIALOG_CANCEL_BUTTON_SIZE); + m_button_cancel->SetCornerRadius(PROGRESSDIALOG_CANCEL_BUTTON_SIZE.y / 2); m_button_cancel->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &event) { if (m_state == Finished) { event.Skip(); diff --git a/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp index a94d3d7c7..4a7b7d5a8 100644 --- a/src/slic3r/GUI/WipeTowerDialog.cpp +++ b/src/slic3r/GUI/WipeTowerDialog.cpp @@ -97,7 +97,7 @@ wxBoxSizer* WipingDialog::create_btn_sizer(long flags) if (flags & wxRESET) { Button* calc_btn = new Button(this, _L("Auto-Calc")); calc_btn->SetMinSize(wxSize(FromDIP(75), FromDIP(24))); - calc_btn->SetCornerRadius(12); + calc_btn->SetCornerRadius(FromDIP(12)); calc_btn->SetBackgroundColor(ok_btn_bg); calc_btn->SetBorderColor(ok_btn_bd); calc_btn->SetTextColor(ok_btn_text); @@ -109,7 +109,7 @@ wxBoxSizer* WipingDialog::create_btn_sizer(long flags) if (flags & wxOK) { Button* ok_btn = new Button(this, _L("OK")); ok_btn->SetMinSize(BTN_SIZE); - ok_btn->SetCornerRadius(12); + ok_btn->SetCornerRadius(FromDIP(12)); ok_btn->SetBackgroundColor(ok_btn_bg); ok_btn->SetBorderColor(ok_btn_bd); ok_btn->SetTextColor(ok_btn_text); @@ -120,7 +120,7 @@ wxBoxSizer* WipingDialog::create_btn_sizer(long flags) if (flags & wxCANCEL) { Button* cancel_btn = new Button(this, _L("Cancel")); cancel_btn->SetMinSize(BTN_SIZE); - cancel_btn->SetCornerRadius(12); + cancel_btn->SetCornerRadius(FromDIP(12)); cancel_btn->SetBackgroundColor(cancel_btn_bg); cancel_btn->SetBorderColor(cancel_btn_bd_); cancel_btn->SetTextColor(cancel_btn_text);