3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-16 11:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

FIX:fix the device interface button adaptation problem

Browse source 
Change-Id: Ide49dce78dd83cdb87e13dc93fb128e554d36871
This commit is contained in:
xiangdong.yang 2022-08-29 15:31:54 +08:00 • committed by Lane.Wei
parent ed1870b3a5
commit 1337498efa
5 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/CMakeLists.txt
View file

@ -68,8 +68,8 @@ set(SLIC3R_GUI_SOURCES
GUI/Widgets/SideTools.hpp GUI/Widgets/SideTools.hpp
GUI/Widgets/WebView.cpp GUI/Widgets/WebView.cpp
GUI/Widgets/WebView.hpp GUI/Widgets/WebView.hpp
GUI/Widgets/wxStaticText2.cpp GUI/Widgets/ErrorMsgStaticText.cpp
GUI/Widgets/wxStaticText2.hpp GUI/Widgets/ErrorMsgStaticText.hpp
GUI/AboutDialog.cpp GUI/AboutDialog.cpp
GUI/AboutDialog.hpp GUI/AboutDialog.hpp
GUI/NetworkTestDialog.cpp GUI/NetworkTestDialog.cpp

6
src/slic3r/GUI/StatusPanel.cpp
View file

@ -517,7 +517,7 @@ wxBoxSizer *StatusBasePanel::create_project_task_page(wxWindow *parent)
wxBoxSizer *static_text_sizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *static_text_sizer = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer *text_sizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *text_sizer = new wxBoxSizer(wxHORIZONTAL);
m_error_text = new wxStaticText2(m_panel_error_txt); m_error_text = new ErrorMsgStaticText(m_panel_error_txt);
m_error_text->SetForegroundColour(wxColour(255, 0, 0)); m_error_text->SetForegroundColour(wxColour(255, 0, 0));
text_sizer->Add(m_error_text, 1, wxEXPAND|wxLEFT, FromDIP(17)); text_sizer->Add(m_error_text, 1, wxEXPAND|wxLEFT, FromDIP(17));
@ -535,9 +535,9 @@ wxBoxSizer *StatusBasePanel::create_project_task_page(wxWindow *parent)
m_button_clean->SetFont(Label::Body_10); m_button_clean->SetFont(Label::Body_10);
m_button_clean->SetMinSize(TASK_BUTTON_SIZE2); m_button_clean->SetMinSize(TASK_BUTTON_SIZE2);
static_text_sizer->Add(text_sizer, 1, wxEXPAND|wxTOP, FromDIP(7)); static_text_sizer->Add(text_sizer, 1, wxEXPAND, 0);
static_text_sizer->Add( FromDIP(10), 0, 0, 0, 0 ); static_text_sizer->Add( FromDIP(10), 0, 0, 0, 0 );
static_text_sizer->Add(m_button_clean, 0, wxALIGN_CENTRE_VERTICAL|wxRIGHT,FromDIP(5)); static_text_sizer->Add(m_button_clean, 0, wxALIGN_CENTRE_VERTICAL|wxRIGHT, FromDIP(5));
m_panel_error_txt->SetSizer(static_text_sizer); m_panel_error_txt->SetSizer(static_text_sizer);
m_panel_error_txt->Hide(); m_panel_error_txt->Hide();

4
src/slic3r/GUI/StatusPanel.hpp
View file

@ -28,7 +28,7 @@
#include "Widgets/ImageSwitchButton.hpp" #include "Widgets/ImageSwitchButton.hpp"
#include "Widgets/AMSControl.hpp" #include "Widgets/AMSControl.hpp"
#include "HMS.hpp" #include "HMS.hpp"
#include "Widgets/wxStaticText2.hpp" #include "Widgets/ErrorMsgStaticText.hpp"
class StepIndicator; class StepIndicator;
#define COMMAND_TIMEOUT_U0 15 #define COMMAND_TIMEOUT_U0 15
@ -177,7 +177,7 @@ protected:
wxBoxSizer * m_tasklist_caption_sizer; wxBoxSizer * m_tasklist_caption_sizer;
wxPanel* m_panel_error_txt; wxPanel* m_panel_error_txt;
wxPanel* m_staticline; wxPanel* m_staticline;
wxStaticText2 * m_error_text; ErrorMsgStaticText * m_error_text;
wxStaticText* m_staticText_calibration_caption; wxStaticText* m_staticText_calibration_caption;
wxStaticText* m_staticText_calibration_caption_top; wxStaticText* m_staticText_calibration_caption_top;
wxStaticText* m_calibration_text; wxStaticText* m_calibration_text;

10
src/slic3r/GUI/Widgets/wxStaticText2.cpp → src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp
View file

@ -1,17 +1,17 @@
#include "wxStaticText2.hpp" #include "ErrorMsgStaticText.hpp"
wxStaticText2::wxStaticText2() {} ErrorMsgStaticText::ErrorMsgStaticText() {}
wxStaticText2::wxStaticText2(wxWindow * parent, ErrorMsgStaticText::ErrorMsgStaticText(wxWindow * parent,
wxWindowID id, wxWindowID id,
const wxPoint & pos, const wxPoint & pos,
const wxSize & size) const wxSize & size)
{ {
Create(parent, id, pos, size); Create(parent, id, pos, size);
Bind(wxEVT_PAINT, &wxStaticText2::paintEvent, this); Bind(wxEVT_PAINT, &ErrorMsgStaticText::paintEvent, this);
} }
void wxStaticText2::paintEvent(wxPaintEvent &evt) void ErrorMsgStaticText::paintEvent(wxPaintEvent &evt)
{ {
auto size = GetSize(); auto size = GetSize();
wxPaintDC dc(this); wxPaintDC dc(this);

12
src/slic3r/GUI/Widgets/wxStaticText2.hpp → src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp
View file

@ -1,18 +1,18 @@
#ifndef _WX_STATTEXT2_H_ #ifndef _WX_ERRORMSGSTATTEXT_H_
#define _WX_STATTEXT2_H_ #define _WX_ERRORMSGSTATTEXT_H_
#include "wx/stattext.h" #include "wx/stattext.h"
class WXDLLIMPEXP_CORE wxStaticText2 : public wxPanel class WXDLLIMPEXP_CORE ErrorMsgStaticText : public wxPanel
{ {
public: public:
wxString m_msg; wxString m_msg;
wxStaticText2(); ErrorMsgStaticText();
wxStaticText2(wxWindow *parent, ErrorMsgStaticText(wxWindow *parent,
wxWindowID id = wxID_ANY, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxSize(200,200)); const wxSize& size = wxSize(0,0));
void paintEvent(wxPaintEvent &evt); void paintEvent(wxPaintEvent &evt);