mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Qt6: deal with changes to window and layout geometry APIs

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2022-02-09 17:00:48 -08:00
parent e29ecf2c9a
commit e61509b032
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
desktop-widgets/locationinformation.cpp
View file

@ -20,7 +20,9 @@
#include <QItemSelectionModel> #include <QItemSelectionModel>
#include <qmessagebox.h> #include <qmessagebox.h>
#include <cstdlib> #include <cstdlib>
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <QDesktopWidget> #include <QDesktopWidget>
#endif
#include <QFileDialog> #include <QFileDialog>
#include <QScrollBar> #include <QScrollBar>
@ -587,7 +589,11 @@ void DiveLocationLineEdit::keyPressEvent(QKeyEvent *ev)
void DiveLocationLineEdit::fixPopupPosition() void DiveLocationLineEdit::fixPopupPosition()
{ {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
const QRect screen = this->screen()->availableGeometry();
#else
const QRect screen = QApplication::desktop()->availableGeometry(this); const QRect screen = QApplication::desktop()->availableGeometry(this);
#endif
const int maxVisibleItems = 5; const int maxVisibleItems = 5;
QPoint pos; QPoint pos;
int rh, w; int rh, w;

8
desktop-widgets/mainwindow.cpp
View file

@ -8,7 +8,9 @@
#include <QFileDialog> #include <QFileDialog>
#include <QMessageBox> #include <QMessageBox>
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <QDesktopWidget> #include <QDesktopWidget>
#endif
#include <QSettings> #include <QSettings>
#include <QShortcut> #include <QShortcut>
#include <QStatusBar> #include <QStatusBar>
@ -807,9 +809,13 @@ void MainWindow::restoreSplitterSizes()
topSplitter->restoreState(settings.value("topSplitter").toByteArray()); topSplitter->restoreState(settings.value("topSplitter").toByteArray());
bottomSplitter->restoreState(settings.value("bottomSplitter").toByteArray()); bottomSplitter->restoreState(settings.value("bottomSplitter").toByteArray());
} else { } else {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
const int appH = qApp->desktop()->size().height(); const int appH = qApp->desktop()->size().height();
const int appW = qApp->desktop()->size().width(); const int appW = qApp->desktop()->size().width();
#else
const int appH = screen()->size().height();
const int appW = screen()->size().width();
#endif
ui.mainSplitter->setSizes({ appH * 3 / 5, appH * 2 / 5 }); ui.mainSplitter->setSizes({ appH * 3 / 5, appH * 2 / 5 });
topSplitter->setSizes({ appW / 2, appW / 2 }); topSplitter->setSizes({ appW / 2, appW / 2 });
bottomSplitter->setSizes({ appW * 3 / 5, appW * 2 / 5 }); bottomSplitter->setSizes({ appW * 3 / 5, appW * 2 / 5 });

2
desktop-widgets/profilewidget.cpp
View file

@ -81,7 +81,9 @@ ProfileWidget::ProfileWidget()
QHBoxLayout *layout = new QHBoxLayout(this); QHBoxLayout *layout = new QHBoxLayout(this);
layout->setSpacing(0); layout->setSpacing(0);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
layout->setMargin(0); layout->setMargin(0);
#endif
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(toolBar); layout->addWidget(toolBar);
layout->addWidget(stack); layout->addWidget(stack);