rixxc/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-04 15:39:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix menubar click-to-move window with Qt 5.15

Browse Source 
Change logic in click handler in eventFilter so that
startSystemMove() is only called when there is no menubar
action under the mouse cursor (i.e., when a blank area
of the menubar is clicked).

Fixes #5925
This commit is contained in:
JCallicoat
2021-01-19 21:06:57 -06:00
committed by Jonathan White
parent fa239865f2
commit 0d3d5db87c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/MainWindow.cpp
View File

@@ -1784,9 +1784,11 @@ bool MainWindowEventFilter::eventFilter(QObject* watched, QEvent* event)
if (event->type() == QEvent::MouseButtonPress) { if (event->type() == QEvent::MouseButtonPress) {
if (watched == mainWindow->m_ui->menubar) { if (watched == mainWindow->m_ui->menubar) {
mainWindow->windowHandle()->startSystemMove(); auto* m = static_cast<QMouseEvent*>(event);
// Continue processing events, so menus keep working. if (!mainWindow->m_ui->menubar->actionAt(m->pos())) {
return false; mainWindow->windowHandle()->startSystemMove();
return false;
}
} else if (watched == mainWindow->m_ui->toolBar) { } else if (watched == mainWindow->m_ui->toolBar) {
if (!mainWindow->m_ui->toolBar->isMovable() || mainWindow->m_ui->toolBar->cursor() != Qt::SizeAllCursor) { if (!mainWindow->m_ui->toolBar->isMovable() || mainWindow->m_ui->toolBar->cursor() != Qt::SizeAllCursor) {
mainWindow->windowHandle()->startSystemMove(); mainWindow->windowHandle()->startSystemMove();