mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX:Optimize button and checkbox resolution adaptation 

jira: STUDIO-11003
Change-Id: Ia6325e3069a09cef45643442ad6f6ee929958446
This commit is contained in:
zhou.xu 2025-03-20 11:02:49 +08:00 committed by lane.wei
parent 3b004980e0
commit 7901e9fbaa
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/slic3r/GUI/SyncAmsInfoDialog.cpp
View File

@ -21,7 +21,8 @@
using namespace Slic3r; using namespace Slic3r;
using namespace Slic3r::GUI; using namespace Slic3r::GUI;
#define BUTTON_SIZE wxSize(FromDIP(58), FromDIP(24)) #define OK_BUTTON_SIZE wxSize(FromDIP(90), FromDIP(24))
#define CANCEL_BUTTON_SIZE wxSize(FromDIP(58), FromDIP(24))
#define SyncAmsInfoDialogWidth FromDIP(675) #define SyncAmsInfoDialogWidth FromDIP(675)
#define SyncAmsInfoDialogHeightMIN FromDIP(620) #define SyncAmsInfoDialogHeightMIN FromDIP(620)
#define SyncAmsInfoDialogHeightMIDDLE FromDIP(630) #define SyncAmsInfoDialogHeightMIDDLE FromDIP(630)
@ -1065,8 +1066,8 @@ SyncAmsInfoDialog::SyncAmsInfoDialog(wxWindow *parent, SyncInfo &info) :
m_button_ok->SetBorderColor(*wxWHITE); m_button_ok->SetBorderColor(*wxWHITE);
m_button_ok->SetTextColor(wxColour(0xFFFFFE)); m_button_ok->SetTextColor(wxColour(0xFFFFFE));
m_button_ok->SetFont(Label::Body_12); m_button_ok->SetFont(Label::Body_12);
m_button_ok->SetSize(wxSize(FromDIP(90), FromDIP(24))); m_button_ok->SetSize(OK_BUTTON_SIZE);
m_button_ok->SetMinSize(wxSize(FromDIP(90), FromDIP(24))); m_button_ok->SetMinSize(OK_BUTTON_SIZE);
m_button_ok->SetCornerRadius(FromDIP(12)); m_button_ok->SetCornerRadius(FromDIP(12));
bSizer_button->Add(m_button_ok, 0, wxALIGN_RIGHT | wxLEFT | wxTOP, FromDIP(10)); bSizer_button->Add(m_button_ok, 0, wxALIGN_RIGHT | wxLEFT | wxTOP, FromDIP(10));
@ -1083,8 +1084,8 @@ SyncAmsInfoDialog::SyncAmsInfoDialog(wxWindow *parent, SyncInfo &info) :
m_button_cancel->SetBackgroundColor(btn_bg_white); m_button_cancel->SetBackgroundColor(btn_bg_white);
m_button_cancel->SetBorderColor(wxColour(38, 46, 48)); m_button_cancel->SetBorderColor(wxColour(38, 46, 48));
m_button_cancel->SetFont(Label::Body_12); m_button_cancel->SetFont(Label::Body_12);
m_button_cancel->SetSize(BUTTON_SIZE); m_button_cancel->SetSize(CANCEL_BUTTON_SIZE);
m_button_cancel->SetMinSize(BUTTON_SIZE); m_button_cancel->SetMinSize(CANCEL_BUTTON_SIZE);
m_button_cancel->SetCornerRadius(FromDIP(12)); m_button_cancel->SetCornerRadius(FromDIP(12));
bSizer_button->Add(m_button_cancel, 0, wxALIGN_RIGHT | wxLEFT | wxTOP, FromDIP(10)); bSizer_button->Add(m_button_cancel, 0, wxALIGN_RIGHT | wxLEFT | wxTOP, FromDIP(10));
@ -2745,7 +2746,8 @@ void SyncAmsInfoDialog::on_dpi_changed(const wxRect &suggested_rect)
{ {
if (ams_mapping_help_icon != nullptr) { if (ams_mapping_help_icon != nullptr) {
ams_mapping_help_icon->msw_rescale(); ams_mapping_help_icon->msw_rescale();
if (img_amsmapping_tip) img_amsmapping_tip->SetBitmap(ams_mapping_help_icon->bmp()); if (img_amsmapping_tip)
img_amsmapping_tip->SetBitmap(ams_mapping_help_icon->bmp());
} }
for (auto material1 : m_materialList) { for (auto material1 : m_materialList) {
@ -2753,10 +2755,12 @@ void SyncAmsInfoDialog::on_dpi_changed(const wxRect &suggested_rect)
} }
m_swipe_left_button->msw_rescale(); m_swipe_left_button->msw_rescale();
m_swipe_right_button->msw_rescale(); m_swipe_right_button->msw_rescale();
m_button_ok->Rescale(); m_button_ok->SetMinSize(OK_BUTTON_SIZE);
m_button_cancel->Rescale(); m_button_ok->SetCornerRadius(FromDIP(12));
m_mapping_popup.msw_rescale(); m_button_cancel->SetMinSize(CANCEL_BUTTON_SIZE);
m_button_cancel->SetCornerRadius(FromDIP(12));
m_merge_color_checkbox->Rescale();
m_append_color_checkbox->Rescale();
Fit(); Fit();
Refresh(); Refresh();
} }

4
src/slic3r/GUI/SyncAmsInfoDialog.hpp
View File

@ -323,10 +323,10 @@ private:
wxStaticText * m_more_setting_tips = nullptr; wxStaticText * m_more_setting_tips = nullptr;
wxStaticBitmap * m_advanced_options_icon{nullptr}; wxStaticBitmap * m_advanced_options_icon{nullptr};
wxBoxSizer * m_append_color_sizer = nullptr; wxBoxSizer * m_append_color_sizer = nullptr;
CheckBox* m_append_color_checkbox = nullptr; ::CheckBox* m_append_color_checkbox = nullptr;
wxStaticText * m_append_color_text = nullptr; wxStaticText * m_append_color_text = nullptr;
wxBoxSizer * m_merge_color_sizer = nullptr; wxBoxSizer * m_merge_color_sizer = nullptr;
CheckBox* m_merge_color_checkbox = nullptr; ::CheckBox* m_merge_color_checkbox = nullptr;
wxStaticText * m_merge_color_text = nullptr; wxStaticText * m_merge_color_text = nullptr;
bool m_is_empty_project = true; bool m_is_empty_project = true;