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

FIX: send WM_NCLBUTTON(xxx) to use default window features 

Change-Id: Ib5caa249857b416fc814ad1ccdea549bd15be3b1
This commit is contained in:
chunmao.guo 2022-07-25 18:07:57 +08:00 committed by Lane.Wei
parent 835f9837b1
commit 157fae556f
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/slic3r/GUI/BBLTopbar.cpp
View File

@ -508,12 +508,17 @@ void BBLTopbar::OnCloseFrame(wxAuiToolBarEvent& event)
void BBLTopbar::OnMouseLeftDClock(wxMouseEvent& mouse) void BBLTopbar::OnMouseLeftDClock(wxMouseEvent& mouse)
{ {
wxPoint mouse_pos = ::wxGetMousePosition();
// check whether mouse is not on any tool item // check whether mouse is not on any tool item
if (this->FindToolByCurrentPosition() != NULL && if (this->FindToolByCurrentPosition() != NULL &&
this->FindToolByCurrentPosition() != m_title_item) { this->FindToolByCurrentPosition() != m_title_item) {
mouse.Skip(); mouse.Skip();
return; return;
} }
#ifdef __W1XMSW__
::PostMessage((HWND) m_frame->GetHandle(), WM_NCLBUTTONDBLCLK, HTCAPTION, MAKELPARAM(mouse_pos.x, mouse_pos.y));
return;
#endif // __WXMSW__
if (m_frame->IsMaximized()) { if (m_frame->IsMaximized()) {
m_frame->Restore(); m_frame->Restore();
@ -567,9 +572,15 @@ void BBLTopbar::OnMouseLeftDown(wxMouseEvent& event)
wxPoint frame_pos = m_frame->GetScreenPosition(); wxPoint frame_pos = m_frame->GetScreenPosition();
m_delta = mouse_pos - frame_pos; m_delta = mouse_pos - frame_pos;
if (FindToolByCurrentPosition() == NULL) if (FindToolByCurrentPosition() == NULL
|| this->FindToolByCurrentPosition() == m_title_item)
{ {
CaptureMouse(); CaptureMouse();
#ifdef __WXMSW__
ReleaseMouse();
::PostMessage((HWND) m_frame->GetHandle(), WM_NCLBUTTONDOWN, HTCAPTION, MAKELPARAM(mouse_pos.x, mouse_pos.y));
return;
#endif // __WXMSW__
} }
event.Skip(); event.Skip();
@ -577,6 +588,7 @@ void BBLTopbar::OnMouseLeftDown(wxMouseEvent& event)
void BBLTopbar::OnMouseLeftUp(wxMouseEvent& event) void BBLTopbar::OnMouseLeftUp(wxMouseEvent& event)
{ {
wxPoint mouse_pos = ::wxGetMousePosition();
if (HasCapture()) if (HasCapture())
{ {
ReleaseMouse(); ReleaseMouse();
@ -587,7 +599,8 @@ void BBLTopbar::OnMouseLeftUp(wxMouseEvent& event)
void BBLTopbar::OnMouseMotion(wxMouseEvent& event) void BBLTopbar::OnMouseMotion(wxMouseEvent& event)
{ {
wxPoint mouse_pos = event.GetPosition(); wxPoint mouse_pos = ::wxGetMousePosition();
if (!HasCapture()) { if (!HasCapture()) {
//m_frame->OnMouseMotion(event); //m_frame->OnMouseMotion(event);
@ -597,7 +610,6 @@ void BBLTopbar::OnMouseMotion(wxMouseEvent& event)
if (event.Dragging() && event.LeftIsDown()) if (event.Dragging() && event.LeftIsDown())
{ {
wxPoint mouse_pos = ::wxGetMousePosition();
// leave max state and adjust position // leave max state and adjust position
if (m_frame->IsMaximized()) { if (m_frame->IsMaximized()) {
wxRect rect = m_frame->GetRect(); wxRect rect = m_frame->GetRect();