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

FIX: transfer input events to children of PopupWindow 

Change-Id: I2ff9ba91a548402d77308aa88de34976a146a571
Jira: STUDIO-8942
This commit is contained in:
chunmao.guo 2024-11-27 14:54:55 +08:00 committed by lane.wei
parent 17edbd8cd5
commit 23e30c7227
3 changed files with 66 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/slic3r/GUI/Plater.cpp
View File

@ -725,17 +725,17 @@ public:
wxSizer * sizer = new wxBoxSizer(wxVERTICAL); wxSizer * sizer = new wxBoxSizer(wxVERTICAL);
sizer->Add(msg, 0, wxTOP | wxLEFT | wxRIGHT, FromDIP(10)); sizer->Add(msg, 0, wxTOP | wxLEFT | wxRIGHT, FromDIP(10));
wxSizer * sizer2 = new wxBoxSizer(wxHORIZONTAL); wxSizer * sizer2 = new wxBoxSizer(wxHORIZONTAL);
wxSizer *sizer21 = new wxBoxSizer(wxVERTICAL); wxSizer *sizer21 = new wxBoxSizer(wxVERTICAL);
sizer21->Add(img4, 0, wxALIGN_CENTRE_HORIZONTAL); sizer21->Add(img4, 0, wxALIGN_CENTRE);
sizer21->Add(txt4, 0, wxTOP | wxALIGN_CENTRE_HORIZONTAL, FromDIP(10)); sizer21->Add(txt4, 0, wxTOP | wxALIGN_CENTRE, FromDIP(10));
sizer21->Add(val4, 0, wxTOP | wxALIGN_CENTRE_HORIZONTAL, FromDIP(10)); sizer21->Add(val4, 0, wxTOP | wxALIGN_CENTRE, FromDIP(10));
sizer2->Add(sizer21, 1); sizer2->Add(sizer21, 1);
wxSizer *sizer22 = new wxBoxSizer(wxVERTICAL); wxSizer *sizer22 = new wxBoxSizer(wxVERTICAL);
sizer22->Add(img1, 0, wxALIGN_CENTRE_HORIZONTAL); sizer22->Add(img1, 0, wxALIGN_CENTRE);
sizer22->Add(txt1, 0, wxTOP | wxALIGN_CENTRE_HORIZONTAL, FromDIP(10)); sizer22->Add(txt1, 0, wxTOP | wxALIGN_CENTRE, FromDIP(10));
sizer22->Add(val1, 0, wxTOP | wxALIGN_CENTRE_HORIZONTAL, FromDIP(10)); sizer22->Add(val1, 0, wxTOP | wxALIGN_CENTRE, FromDIP(10));
sizer2->Add(sizer22, 1); sizer2->Add(sizer22, 1);
sizer->Add(sizer2, 0, wxTOP | wxBOTTOM | wxLEFT | wxRIGHT | wxEXPAND, FromDIP(10)); sizer->Add(sizer2, 0, wxTOP | wxBOTTOM | wxLEFT | wxRIGHT | wxEXPAND, FromDIP(10));
SetSizer(sizer); SetSizer(sizer);

49
src/slic3r/GUI/Widgets/PopupWindow.cpp
View File

@ -17,6 +17,11 @@ bool PopupWindow::Create(wxWindow *parent, int style)
return false; return false;
#ifdef __WXGTK__ #ifdef __WXGTK__
GetTopParent(parent)->Bind(wxEVT_ACTIVATE, &PopupWindow::topWindowActivate, this); GetTopParent(parent)->Bind(wxEVT_ACTIVATE, &PopupWindow::topWindowActivate, this);
#endif
#ifdef __WXOSX__
if (style & wxPU_CONTAINS_CONTROLS)
for (auto evt : {wxEVT_LEFT_DOWN, wxEVT_LEFT_UP, wxEVT_LEFT_DCLICK, wxEVT_MOTION, wxEVT_MOUSEWHEEL})
Bind(evt, &PopupWindow::OnMouseEvent2, this);
#endif #endif
return true; return true;
} }
@ -28,6 +33,50 @@ PopupWindow::~PopupWindow()
#endif #endif
} }
#ifdef __WXOSX__
static wxEvtHandler * HitTest(wxWindow * parent, wxMouseEvent &evt)
{
auto pt = evt.GetPosition();
const wxWindowList &children = parent->GetChildren();
for (auto w : children) {
wxRect rc { w->GetPosition(), w->GetSize() };
if (rc.Contains(pt)) {
evt.SetPosition(pt - rc.GetTopLeft());
if (auto child = HitTest(w, evt))
return child;
return w;
}
}
return nullptr;
}
void PopupWindow::OnMouseEvent2(wxMouseEvent &evt)
{
auto child = ::HitTest(this, evt);
if (evt.GetEventType() == wxEVT_MOTION) {
auto h = child ? child : this;
if (hovered != h) {
wxMouseEvent leave(wxEVT_LEAVE_WINDOW);
leave.SetEventObject(hovered);
leave.SetId(static_cast<wxWindow*>(hovered)->GetId());
hovered->ProcessEventLocally(leave);
hovered = h;
wxMouseEvent enter(wxEVT_ENTER_WINDOW);
enter.SetEventObject(hovered);
enter.SetId(static_cast<wxWindow*>(hovered)->GetId());
hovered->ProcessEventLocally(enter);
}
}
if (child) {
child->ProcessEventLocally(evt);
} else {
evt.Skip();
}
}
#endif
#ifdef __WXGTK__ #ifdef __WXGTK__
void PopupWindow::topWindowActivate(wxActivateEvent &event) void PopupWindow::topWindowActivate(wxActivateEvent &event)
{ {

7
src/slic3r/GUI/Widgets/PopupWindow.hpp
View File

@ -12,10 +12,15 @@ public:
PopupWindow(wxWindow *parent, int style = wxBORDER_NONE) PopupWindow(wxWindow *parent, int style = wxBORDER_NONE)
{ Create(parent, style); } { Create(parent, style); }
bool Create(wxWindow *parent, int flags = wxBORDER_NONE); bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
private: private:
#ifdef __WXOSX__
void OnMouseEvent2(wxMouseEvent &evt);
wxEvtHandler * hovered { this };
#endif
#ifdef __WXGTK__ #ifdef __WXGTK__
void topWindowActivate(wxActivateEvent &event); void topWindowActivate(wxActivateEvent &event);
#endif #endif