Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2025-01-28 16:20:26 +01:00
Code Issues Releases Wiki Activity

Remove use of QDesktopWidget in settingsdialog

Browse Source
This commit is contained in:
Jonas Kvinge 2019-07-09 00:04:52 +02:00
parent b5dd90b2d5
commit 8cb1015a35
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/settings/settingsdialog.cpp
View File

@ -20,28 +20,22 @@
#include "config.h"
#include <QObject>
#include <QWidget>
#include <QApplication>
#include <QDialog>
#include <QWindow>
#include <QScreen>
#include <QAbstractItemModel>
#include <QAbstractItemView>
#include <QDesktopWidget>
#include <QVariant>
#include <QTreeWidget>
#include <QString>
#include <QStringBuilder>
#include <QIcon>
#include <QPainter>
#include <QFlags>
#include <QFrame>
#include <QKeySequence>
#include <QLabel>
#include <QLayout>
#include <QRect>
#include <QSize>
#include <QDialogButtonBox>
#include <QPushButton>
#include <QScrollArea>
#include <QStackedWidget>
#include <QTreeWidget>
#include <QComboBox>
#include <QPushButton>
#include "core/application.h"
#include "core/player.h"
@ -287,7 +281,7 @@ void SettingsDialog::showEvent(QShowEvent *e) {
loading_settings_ = false;
// Resize the dialog if it's too big
const QSize available = QApplication::desktop()->availableGeometry(this).size();
const QRect available = window()->windowHandle()->screen()->geometry();
if (available.height() < height()) {
resize(width(), sizeHint().height());
}

15
src/settings/settingsdialog.h
View File

@ -24,25 +24,22 @@
#include "config.h"
#include <stdbool.h>
#include <QObject>
#include <QWidget>
#include <QDialog>
#include <QStyledItemDelegate>
#include <QMap>
#include <QSize>
#include <QString>
#include <QPainter>
#include <QStyleOption>
#include <QStyledItemDelegate>
#include <QAbstractButton>
#include <QScrollArea>
#include <QTreeWidgetItem>
#include <QComboBox>
#include <QSettings>
#include "core/logging.h"
#include "widgets/osd.h"
class QModelIndex;
class QTreeWidgetItem;
class QComboBox;
class QScrollArea;
class QAbstractButton;
class QStyleOptionViewItem;
class QShowEvent;
class Application;