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

FIX: [STUDIO-1400] The scaling problem of the device status interface 

Jira: STUDIO-1400

Change-Id: I37b736c25367aa9db3a1258482a0e3db53a8da97
This commit is contained in:
maosheng.wei 2023-07-17 15:32:37 +08:00 committed by Lane.Wei
parent 3013d89b6b
commit 4ebbb7db42
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/MediaPlayCtrl.cpp
View File

@ -430,6 +430,10 @@ void MediaPlayCtrl::ToggleStream()
}); });
} }
void MediaPlayCtrl::msw_rescale() {
m_button_play->Rescale();
}
void MediaPlayCtrl::onStateChanged(wxMediaEvent &event) void MediaPlayCtrl::onStateChanged(wxMediaEvent &event)
{ {
auto last_state = m_last_state; auto last_state = m_last_state;

2
src/slic3r/GUI/MediaPlayCtrl.h
View File

@ -40,6 +40,8 @@ public:
void ToggleStream(); void ToggleStream();
void msw_rescale();
protected: protected:
void onStateChanged(wxMediaEvent & event); void onStateChanged(wxMediaEvent & event);

13
src/slic3r/GUI/StatusPanel.cpp
View File

@ -162,7 +162,7 @@ void PrintingTaskPanel::create_panel(wxWindow* parent)
m_staticText_printing = new wxStaticText(m_panel_printing_title, wxID_ANY ,_L("Printing Progress")); m_staticText_printing = new wxStaticText(m_panel_printing_title, wxID_ANY ,_L("Printing Progress"));
m_staticText_printing->Wrap(-1); m_staticText_printing->Wrap(-1);
m_staticText_printing->SetFont(PAGE_TITLE_FONT); //m_staticText_printing->SetFont(PAGE_TITLE_FONT);
m_staticText_printing->SetForegroundColour(PAGE_TITLE_FONT_COL); m_staticText_printing->SetForegroundColour(PAGE_TITLE_FONT_COL);
bSizer_printing_title->Add(m_staticText_printing, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, PAGE_TITLE_LEFT_MARGIN); bSizer_printing_title->Add(m_staticText_printing, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, PAGE_TITLE_LEFT_MARGIN);
@ -515,7 +515,7 @@ void PrintingTaskPanel::msw_rescale()
{ {
m_panel_printing_title->SetSize(wxSize(-1, FromDIP(PAGE_TITLE_HEIGHT))); m_panel_printing_title->SetSize(wxSize(-1, FromDIP(PAGE_TITLE_HEIGHT)));
m_printing_sizer->SetMinSize(wxSize(PAGE_MIN_WIDTH, -1)); m_printing_sizer->SetMinSize(wxSize(PAGE_MIN_WIDTH, -1));
m_staticText_printing->SetMinSize(wxSize(PAGE_TITLE_TEXT_WIDTH, PAGE_TITLE_HEIGHT)); //m_staticText_printing->SetMinSize(wxSize(PAGE_TITLE_TEXT_WIDTH, PAGE_TITLE_HEIGHT));
m_gauge_progress->SetHeight(PROGRESSBAR_HEIGHT); m_gauge_progress->SetHeight(PROGRESSBAR_HEIGHT);
m_gauge_progress->Rescale(); m_gauge_progress->Rescale();
m_button_abort->msw_rescale(); m_button_abort->msw_rescale();
@ -843,7 +843,7 @@ wxBoxSizer *StatusBasePanel::create_monitoring_page()
m_staticText_monitoring = new Label(m_panel_monitoring_title, _L("Camera")); m_staticText_monitoring = new Label(m_panel_monitoring_title, _L("Camera"));
m_staticText_monitoring->Wrap(-1); m_staticText_monitoring->Wrap(-1);
m_staticText_monitoring->SetFont(PAGE_TITLE_FONT); //m_staticText_monitoring->SetFont(PAGE_TITLE_FONT);
m_staticText_monitoring->SetForegroundColour(PAGE_TITLE_FONT_COL); m_staticText_monitoring->SetForegroundColour(PAGE_TITLE_FONT_COL);
bSizer_monitoring_title->Add(m_staticText_monitoring, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, PAGE_TITLE_LEFT_MARGIN); bSizer_monitoring_title->Add(m_staticText_monitoring, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, PAGE_TITLE_LEFT_MARGIN);
@ -930,7 +930,7 @@ wxBoxSizer *StatusBasePanel::create_machine_control_page(wxWindow *parent)
wxBoxSizer *bSizer_control_title = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *bSizer_control_title = new wxBoxSizer(wxHORIZONTAL);
m_staticText_control = new Label(m_panel_control_title,_L("Control")); m_staticText_control = new Label(m_panel_control_title,_L("Control"));
m_staticText_control->Wrap(-1); m_staticText_control->Wrap(-1);
m_staticText_control->SetFont(PAGE_TITLE_FONT); //m_staticText_control->SetFont(PAGE_TITLE_FONT);
m_staticText_control->SetForegroundColour(PAGE_TITLE_FONT_COL); m_staticText_control->SetForegroundColour(PAGE_TITLE_FONT_COL);
StateColor btn_bg_green(std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), StateColor btn_bg_green(std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed),
@ -3982,10 +3982,11 @@ void StatusPanel::msw_rescale()
m_project_task_panel->init_bitmaps(); m_project_task_panel->init_bitmaps();
m_project_task_panel->msw_rescale(); m_project_task_panel->msw_rescale();
m_panel_monitoring_title->SetSize(wxSize(-1, FromDIP(PAGE_TITLE_HEIGHT))); m_panel_monitoring_title->SetSize(wxSize(-1, FromDIP(PAGE_TITLE_HEIGHT)));
m_staticText_monitoring->SetMinSize(wxSize(PAGE_TITLE_TEXT_WIDTH, PAGE_TITLE_HEIGHT)); //m_staticText_monitoring->SetMinSize(wxSize(PAGE_TITLE_TEXT_WIDTH, PAGE_TITLE_HEIGHT));
m_bmToggleBtn_timelapse->Rescale(); m_bmToggleBtn_timelapse->Rescale();
m_panel_control_title->SetSize(wxSize(-1, FromDIP(PAGE_TITLE_HEIGHT))); m_panel_control_title->SetSize(wxSize(-1, FromDIP(PAGE_TITLE_HEIGHT)));
m_staticText_control->SetMinSize(wxSize(-1, PAGE_TITLE_HEIGHT)); //m_staticText_control->SetMinSize(wxSize(-1, PAGE_TITLE_HEIGHT));
m_media_play_ctrl->msw_rescale();
m_bpButton_xy->SetBitmap(m_bitmap_axis_home); m_bpButton_xy->SetBitmap(m_bitmap_axis_home);
m_bpButton_xy->SetMinSize(AXIS_MIN_SIZE); m_bpButton_xy->SetMinSize(AXIS_MIN_SIZE);
m_bpButton_xy->SetSize(AXIS_MIN_SIZE); m_bpButton_xy->SetSize(AXIS_MIN_SIZE);

12
src/slic3r/GUI/Widgets/SideTools.cpp
View File

@ -92,6 +92,18 @@ bool SideToolsPanel::is_in_interval()
void SideToolsPanel::msw_rescale() void SideToolsPanel::msw_rescale()
{ {
m_printing_img.msw_rescale();
m_arrow_img.msw_rescale();
m_none_printing_img.msw_rescale();
m_none_arrow_img.msw_rescale();
m_none_add_img.msw_rescale();
m_wifi_none_img.msw_rescale();
m_wifi_weak_img.msw_rescale();
m_wifi_middle_img.msw_rescale();
m_wifi_strong_img.msw_rescale();
Refresh(); Refresh();
} }