diff options
| author | Simon Rettberg | 2022-09-14 10:38:10 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2022-09-14 10:38:10 +0200 |
| commit | e3f00a6fd53cd1c0b34aa98f793b27bbb780e225 (patch) | |
| tree | c0f6068743cfbc4643f8db96ed200b0faacbe555 | |
| parent | Fix compile on recent Qt5 versions (diff) | |
| download | beamergui-e3f00a6fd53cd1c0b34aa98f793b27bbb780e225.tar.gz beamergui-e3f00a6fd53cd1c0b34aa98f793b27bbb780e225.tar.xz beamergui-e3f00a6fd53cd1c0b34aa98f793b27bbb780e225.zip | |
Turn into QDialog so 'Esc' etc. works
| -rw-r--r-- | src/widget.cpp | 5 | ||||
| -rw-r--r-- | src/widget.h | 4 | ||||
| -rw-r--r-- | src/widget.ui | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/widget.cpp b/src/widget.cpp index bdac8f2..c76bde7 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -77,7 +77,7 @@ static const QString STYLE_RELOAD_BUTTON_HOT(STYLE_RELOAD_BUTTON_NORMAL + "backg */ Widget::Widget(QWidget *parent) : - QWidget(parent), + QDialog(parent), _ui(new Ui::Widget), _popupCount(0), _iProjector(QIcon(":projector")), @@ -247,6 +247,9 @@ void Widget::hideEvent(QHideEvent *event) { QWidget::hideEvent(event); _lastScreenCount = ScreenSetup::inst()->getOutputCount(); + if (!CommandLine::backgroundMode()) { + qApp->quit(); + } } static void fillCombo(QComboBox *combo, const ResolutionVector &resolutions, const QSize &preselected, const QSize &preferred = QSize()) diff --git a/src/widget.h b/src/widget.h index 2dc604c..e15fef6 100644 --- a/src/widget.h +++ b/src/widget.h @@ -1,7 +1,7 @@ #ifndef WIDGET_H #define WIDGET_H -#include <QWidget> // for Qt5 +#include <QDialog> #include <QDebug> #include <QIcon> @@ -12,7 +12,7 @@ class Widget; class AdvancedScreen; class AdvancedOutput; -class Widget : public QWidget +class Widget : public QDialog { Q_OBJECT diff --git a/src/widget.ui b/src/widget.ui index 022bfcb..5ad9300 100644 --- a/src/widget.ui +++ b/src/widget.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> <class>Widget</class> - <widget class="QWidget" name="Widget"> + <widget class="QDialog" name="Widget"> <property name="geometry"> <rect> <x>0</x> |