diff --git a/server/2015Remote/ToolbarDlg.cpp b/server/2015Remote/ToolbarDlg.cpp index 670cd8d..e4827f3 100644 --- a/server/2015Remote/ToolbarDlg.cpp +++ b/server/2015Remote/ToolbarDlg.cpp @@ -79,6 +79,15 @@ void CToolbarDlg::CheckMousePosition() return; } + // 菜单开着时不做缩回判定:菜单会展开到屏幕中间,鼠标跟着离开边缘区域, + // 按下面的逻辑就会 SlideOut,工具栏一藏菜单也就没了。 + if (m_bMenuOpen) { + if (!m_bVisible) { + SlideIn(); + } + return; + } + CPoint pt; GetCursorPos(&pt); @@ -722,7 +731,11 @@ void CToolbarDlg::OnBnClickedQuality() // 弹出菜单 CRect rc; m_btnQuality.GetWindowRect(&rc); + // 菜单开着期间禁止自动缩回:TrackPopupMenu 是模态循环,父窗口的 WM_TIMER 照常 + // 派发,鼠标移到菜单上就算"离开边缘",工具栏缩回去菜单也跟着消失。 + m_bMenuOpen = true; UINT cmd = menu.TrackPopupMenu(TPM_RETURNCMD | TPM_NONOTIFY, rc.right, rc.top, this); + m_bMenuOpen = false; if (cmd) { GetParent()->PostMessage(WM_SYSCOMMAND, cmd, 0); } diff --git a/server/2015Remote/ToolbarDlg.h b/server/2015Remote/ToolbarDlg.h index c323d50..763b3a0 100644 --- a/server/2015Remote/ToolbarDlg.h +++ b/server/2015Remote/ToolbarDlg.h @@ -21,6 +21,10 @@ public: int m_nHeight = 40; bool m_bVisible = false; bool m_bLocked = false; // 是否锁定工具栏 + // 弹出菜单期间暂停自动缩回。TrackPopupMenu 是模态循环,父窗口的 WM_TIMER 照常 + // 派发,鼠标一离开屏幕边缘 CheckMousePosition 就会 SlideOut,菜单跟着消失, + // 质量等级根本选不了。 + bool m_bMenuOpen = false; int m_nPosition = 0; // 工具栏位置 (0=上, 1=下, 2=左, 3=右) int m_nOpacityLevel = 0; // 透明度级别 (0=100%, 1=75%, 2=50%)