From fe2ae4ab9b07afe7fce2535e03da048496dd9f92 Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Thu, 23 Jan 2025 20:07:57 +0800 Subject: [PATCH] FIX: the select machine suit DPI jira: [STUDIO-10067] Change-Id: Idee141746b73764c9bb80746358ec65f1147cc31 --- src/slic3r/GUI/SelectMachinePop.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/SelectMachinePop.cpp b/src/slic3r/GUI/SelectMachinePop.cpp index 069e4baa6..ed6e1566a 100644 --- a/src/slic3r/GUI/SelectMachinePop.cpp +++ b/src/slic3r/GUI/SelectMachinePop.cpp @@ -46,7 +46,12 @@ wxDEFINE_EVENT(EVT_CLEAR_IPADDRESS, wxCommandEvent); MachineObjectPanel::MachineObjectPanel(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long style, const wxString &name) { - wxPanel::Create(parent, id, pos, SELECT_MACHINE_ITEM_SIZE, style, name); + wxPanel::Create(parent, id, pos, wxDefaultSize, style, name); + + SetSize(SELECT_MACHINE_ITEM_SIZE); + SetMinSize(SELECT_MACHINE_ITEM_SIZE); + SetMaxSize(SELECT_MACHINE_ITEM_SIZE); + Bind(wxEVT_PAINT, &MachineObjectPanel::OnPaint, this); SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE)); @@ -959,9 +964,9 @@ void EditDevNameDialog::on_edit_name(wxCommandEvent &e) } } - PinCodePanel::PinCodePanel(wxWindow* parent, int type, wxWindowID winid /*= wxID_ANY*/, const wxPoint& pos /*= wxDefaultPosition*/, const wxSize& size /*= wxDefaultSize*/) +PinCodePanel::PinCodePanel(wxWindow* parent, int type, wxWindowID winid /*= wxID_ANY*/, const wxPoint& pos /*= wxDefaultPosition*/, const wxSize& size /*= wxDefaultSize*/) { - wxPanel::Create(parent, winid, pos, SELECT_MACHINE_ITEM_SIZE); + wxPanel::Create(parent, winid, pos); Bind(wxEVT_PAINT, &PinCodePanel::OnPaint, this); SetSize(SELECT_MACHINE_ITEM_SIZE); SetMaxSize(SELECT_MACHINE_ITEM_SIZE);