3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 23:46:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

FIX:macos13 system display printer rename button

Browse source 
Change-Id: I56a492043690ee6ef320fee626f4a09c070119d9
This commit is contained in:
tao wang 2023-06-15 09:36:09 +08:00 • committed by Lane.Wei
parent 1ca7c4e554
commit 447e7306bd
2 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/slic3r/GUI/SelectMachine.cpp
View file

@ -13,6 +13,7 @@
#include "Widgets/StaticBox.hpp" #include "Widgets/StaticBox.hpp"
#include "ConnectPrinter.hpp" #include "ConnectPrinter.hpp"
#include <wx/progdlg.h> #include <wx/progdlg.h>
#include <wx/clipbrd.h> #include <wx/clipbrd.h>
#include <wx/dcgraph.h> #include <wx/dcgraph.h>
@ -175,7 +176,21 @@ MachineObjectPanel::MachineObjectPanel(wxWindow *parent, wxWindowID id, const wx
this->Bind(wxEVT_ENTER_WINDOW, &MachineObjectPanel::on_mouse_enter, this); this->Bind(wxEVT_ENTER_WINDOW, &MachineObjectPanel::on_mouse_enter, this);
this->Bind(wxEVT_LEAVE_WINDOW, &MachineObjectPanel::on_mouse_leave, this); this->Bind(wxEVT_LEAVE_WINDOW, &MachineObjectPanel::on_mouse_leave, this);
this->Bind(wxEVT_LEFT_UP, &MachineObjectPanel::on_mouse_left_up, this); this->Bind(wxEVT_LEFT_UP, &MachineObjectPanel::on_mouse_left_up, this);
#ifdef __APPLE__
wxPlatformInfo platformInfo;
auto major = platformInfo.GetOSMajorVersion();
auto minor = platformInfo.GetOSMinorVersion();
auto micro = platformInfo.GetOSMicroVersion();
//macos 13.1.0
if (major >= 13 && minor >= 1 && micro >= 0) {
m_is_macos_special_version = true;
} }
#endif
}
MachineObjectPanel::~MachineObjectPanel() {} MachineObjectPanel::~MachineObjectPanel() {}
@ -286,10 +301,14 @@ void MachineObjectPanel::doRender(wxDC &dc)
dc.DrawText(finally_name, wxPoint(left, (size.y - sizet.y) / 2)); dc.DrawText(finally_name, wxPoint(left, (size.y - sizet.y) / 2));
if (m_hover) {
if (m_hover || m_is_macos_special_version) {
if (m_hover && !m_is_macos_special_version) {
dc.SetPen(SELECT_MACHINE_BRAND); dc.SetPen(SELECT_MACHINE_BRAND);
dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.DrawRectangle(0, 0, size.x, size.y); dc.DrawRectangle(0, 0, size.x, size.y);
}
if (m_show_bind) { if (m_show_bind) {
if (m_bind_state == ALLOW_UNBIND) { if (m_bind_state == ALLOW_UNBIND) {
@ -303,6 +322,7 @@ void MachineObjectPanel::doRender(wxDC &dc)
dc.DrawBitmap(m_edit_name_img.bmp(), left, (size.y - m_edit_name_img.GetBmpSize().y) / 2); dc.DrawBitmap(m_edit_name_img.bmp(), left, (size.y - m_edit_name_img.GetBmpSize().y) / 2);
} }
} }
} }
void MachineObjectPanel::update_machine_info(MachineObject *info, bool is_my_devices) void MachineObjectPanel::update_machine_info(MachineObject *info, bool is_my_devices)

6
src/slic3r/GUI/SelectMachine.hpp
View file

@ -117,6 +117,7 @@ private:
bool m_show_edit{false}; bool m_show_edit{false};
bool m_show_bind{false}; bool m_show_bind{false};
bool m_hover {false}; bool m_hover {false};
bool m_is_macos_special_version{false};
PrinterBindState m_bind_state; PrinterBindState m_bind_state;
@ -145,17 +146,14 @@ public:
const wxSize & size = wxDefaultSize, const wxSize & size = wxDefaultSize,
long style = wxTAB_TRAVERSAL, long style = wxTAB_TRAVERSAL,
const wxString &name = wxEmptyString); const wxString &name = wxEmptyString);
~MachineObjectPanel(); ~MachineObjectPanel();
void show_bind_dialog(); void show_bind_dialog();
void set_printer_state(PrinterState state); void set_printer_state(PrinterState state);
void show_printer_bind(bool show, PrinterBindState state); void show_printer_bind(bool show, PrinterBindState state);
void show_edit_printer_name(bool show); void show_edit_printer_name(bool show);
void update_machine_info(MachineObject *info, bool is_my_devices = false); void update_machine_info(MachineObject *info, bool is_my_devices = false);
protected: protected:
void OnPaint(wxPaintEvent &event); void OnPaint(wxPaintEvent &event);
void render(wxDC &dc); void render(wxDC &dc);