amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

FIX:textinput behavior on send dialog (STUDIO-2347)

Browse source 
Change-Id: Iec970de7cd2f85b835b64283089c41f52df1cfcc
This commit is contained in:
liz.li 2023-04-03 16:44:31 +08:00 committed by Lane.Wei
parent f0a41b552b
commit a6be285843
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/slic3r/GUI/AmsMappingPopup.cpp
View file

@ -45,7 +45,13 @@ wxDEFINE_EVENT(EVT_SET_FINISH_MAPPING, wxCommandEvent);
SetMaxSize(MATERIAL_ITEM_SIZE); SetMaxSize(MATERIAL_ITEM_SIZE);
SetBackgroundColour(*wxWHITE); SetBackgroundColour(*wxWHITE);
Bind(wxEVT_PAINT, &MaterialItem::paintEvent, this); m_main_panel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
auto main_sizer = new wxBoxSizer(wxVERTICAL);
main_sizer->Add(m_main_panel, 1, wxEXPAND);
this->SetSizer(main_sizer);
this->Layout();
m_main_panel->Bind(wxEVT_PAINT, &MaterialItem::paintEvent, this);
wxGetApp().UpdateDarkUI(this); wxGetApp().UpdateDarkUI(this);
} }
@ -89,7 +95,7 @@ void MaterialItem::on_normal()
void MaterialItem::paintEvent(wxPaintEvent &evt) void MaterialItem::paintEvent(wxPaintEvent &evt)
{ {
wxPaintDC dc(this); wxPaintDC dc(m_main_panel);
render(dc); render(dc);
//PrepareDC(buffdc); //PrepareDC(buffdc);

1
src/slic3r/GUI/AmsMappingPopup.hpp
View file

@ -66,6 +66,7 @@ public:
MaterialItem(wxWindow *parent,wxColour mcolour, wxString mname); MaterialItem(wxWindow *parent,wxColour mcolour, wxString mname);
~MaterialItem(); ~MaterialItem();
wxPanel* m_main_panel;
wxColour m_material_coloul; wxColour m_material_coloul;
wxString m_material_name; wxString m_material_name;

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

@ -1024,6 +1024,11 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
m_rename_input->SetMinSize(wxSize(FromDIP(380), FromDIP(24))); m_rename_input->SetMinSize(wxSize(FromDIP(380), FromDIP(24)));
m_rename_input->SetMaxSize(wxSize(FromDIP(380), FromDIP(24))); m_rename_input->SetMaxSize(wxSize(FromDIP(380), FromDIP(24)));
m_rename_input->Bind(wxEVT_TEXT_ENTER, [this](auto& e) {on_rename_enter();}); m_rename_input->Bind(wxEVT_TEXT_ENTER, [this](auto& e) {on_rename_enter();});
m_rename_input->Bind(wxEVT_KILL_FOCUS, [this](auto& e) {
if (!m_rename_input->HasFocus() && !m_rename_text->HasFocus())
on_rename_enter();
else
e.Skip(); });
rename_edit_sizer_v->Add(m_rename_input, 1, wxALIGN_CENTER, 0); rename_edit_sizer_v->Add(m_rename_input, 1, wxALIGN_CENTER, 0);
@ -1217,7 +1222,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
m_ams_backup_tip->Bind(wxEVT_LEAVE_WINDOW, [this](auto& e) {SetCursor(wxCURSOR_ARROW); }); m_ams_backup_tip->Bind(wxEVT_LEAVE_WINDOW, [this](auto& e) {SetCursor(wxCURSOR_ARROW); });
img_ams_backup->Bind(wxEVT_LEAVE_WINDOW, [this](auto& e) {SetCursor(wxCURSOR_ARROW); }); img_ams_backup->Bind(wxEVT_LEAVE_WINDOW, [this](auto& e) {SetCursor(wxCURSOR_ARROW); });
m_ams_backup_tip->Bind(wxEVT_LEFT_DOWN, [this](auto& e) {popup_filament_backup();}); m_ams_backup_tip->Bind(wxEVT_LEFT_DOWN, [this](auto& e) {popup_filament_backup(); on_rename_enter(); });
img_ams_backup->Bind(wxEVT_LEFT_DOWN, [this](auto& e) {popup_filament_backup();}); img_ams_backup->Bind(wxEVT_LEFT_DOWN, [this](auto& e) {popup_filament_backup();});
@ -3501,7 +3506,7 @@ void EditDevNameDialog::on_edit_name(wxCommandEvent &e)
SetBackgroundStyle(wxBG_STYLE_CUSTOM); SetBackgroundStyle(wxBG_STYLE_CUSTOM);
wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
m_staticbitmap = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize); m_staticbitmap = new wxStaticBitmap(parent, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize);
sizer->Add(m_staticbitmap, 1, wxEXPAND|wxALL, 0); sizer->Add(m_staticbitmap, 1, wxEXPAND|wxALL, 0);
SetSizer(sizer); SetSizer(sizer);
Layout(); Layout();