blumia/pineapple-pictures
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: allow drag to move window when maximized when Qt >= 6.11.2

Browse Source 
Resolve: https://github.com/BLumia/pineapple-pictures/issues/184

Also use git version of aqtinstall for Qt 6.11.0+ for Windows
miurahr/aqtinstall#1007
This commit is contained in:
blumia
2026-08-19 19:06:44 +08:00
parent 715b3d3ebc
commit 44e4a709c3
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/windows.yml
+3 -1
View File
@@ -8,7 +8,7 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- qt_ver: '6.10.3' - qt_ver: '6.11.2'
vs: '2022' vs: '2022'
aqt_arch: 'win64_msvc2022_64' aqt_arch: 'win64_msvc2022_64'
msvc_arch: 'x64' msvc_arch: 'x64'
@@ -24,6 +24,8 @@ jobs:
version: ${{ matrix.qt_ver }} version: ${{ matrix.qt_ver }}
modules: 'qtimageformats' modules: 'qtimageformats'
cache: true cache: true
# we need this until miurahr/aqtinstall#1007 ships 3.3.1 for Qt >= 6.11.0 for Windows.
aqtsource: 'aqtinstall @ git+https://github.com/miurahr/aqtinstall@16db45a70b5905ad596941b223469bc86a56901e'
- name: Build - name: Build
shell: cmd shell: cmd
run: | run: |
app/mainwindow.cpp
+1 -1
View File
@@ -357,7 +357,7 @@ void MainWindow::leaveEvent(QEvent *event)
void MainWindow::mousePressEvent(QMouseEvent *event) void MainWindow::mousePressEvent(QMouseEvent *event)
{ {
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN) and QT_VERSION < QT_VERSION_CHECK(6, 11, 2)
const bool shouldAcceptDrag = !isMaximized() && !isFullScreen(); const bool shouldAcceptDrag = !isMaximized() && !isFullScreen();
#else #else
const bool shouldAcceptDrag = !isFullScreen(); const bool shouldAcceptDrag = !isFullScreen();
app/titlebar.cpp
+1 -1
View File
@@ -136,7 +136,7 @@ void TitleBar::mouseMoveEvent(QMouseEvent *event)
} }
} }
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN) and QT_VERSION < QT_VERSION_CHECK(6, 11, 2)
const bool shouldAcceptDrag = !window()->isMaximized() && !window()->isFullScreen(); const bool shouldAcceptDrag = !window()->isMaximized() && !window()->isFullScreen();
#else #else
const bool shouldAcceptDrag = !window()->isFullScreen(); const bool shouldAcceptDrag = !window()->isFullScreen();