Skip to content

Commit 9d68ef4

Browse files
committed
Allow MainWindow to be resized
1 parent 47026a3 commit 9d68ef4

File tree

5 files changed

+19
-4
lines changed

5 files changed

+19
-4
lines changed

src/MainWindow.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,11 @@ MainWindow::MainWindow(QString exepath,
154154
{
155155
Log::information("============ Initializing user interface ============");
156156

157+
const QByteArray geometry = QSettings().value("geometry", QByteArray()).toByteArray();
158+
if (!geometry.isEmpty()) {
159+
restoreGeometry(geometry);
160+
}
161+
157162
this->setWindowIcon(QIcon::fromTheme("jamesdsp", QIcon(":/icons/icon.png")));
158163

159164
ui->eq_widget->setBands(PresetProvider::EQ::defaultPreset(), false);
@@ -522,6 +527,8 @@ void MainWindow::fireTimerSignal()
522527
// Overrides
523528
void MainWindow::closeEvent(QCloseEvent *event)
524529
{
530+
QSettings().setValue("geometry", saveGeometry());
531+
525532
#ifdef Q_OS_OSX
526533

527534
if (!event->spontaneous() || !isVisible())
@@ -538,6 +545,13 @@ void MainWindow::closeEvent(QCloseEvent *event)
538545
}
539546
}
540547

548+
void MainWindow::resizeEvent(QResizeEvent *event)
549+
{
550+
QMainWindow::resizeEvent(event);
551+
QSettings().setValue("geometry", saveGeometry());
552+
}
553+
554+
541555
// Systray
542556
void MainWindow::raiseWindow()
543557
{

src/MainWindow.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ class MainWindow :
7373
EELEditor *eelEditor() const;
7474

7575
protected:
76+
void resizeEvent(QResizeEvent* event) override;
7677
void closeEvent(QCloseEvent *event) override;
7778

7879
public slots:

src/MainWindow.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</property>
1919
<property name="maximumSize">
2020
<size>
21-
<width>1000</width>
22-
<height>410</height>
21+
<width>16777215</width>
22+
<height>16777215</height>
2323
</size>
2424
</property>
2525
<property name="windowTitle">

src/interface/fragment/AppManagerFragment.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ AppManagerFragment::~AppManagerFragment()
3131
{
3232
disconnect(model, &AppItemModel::rowsInserted, this, &AppManagerFragment::rowsInserted);
3333
disconnect(model, &AppItemModel::rowsAboutToBeRemoved, this, &AppManagerFragment::rowsAboutToBeRemoved);
34-
delete model;
3534
delete ui;
35+
delete model;
3636
}
3737

3838
void AppManagerFragment::rowsInserted(const QModelIndex &parent, int first, int last)

src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ int main(int argc,
9292
QApplication::setQuitOnLastWindowClosed(false);
9393
MainWindow w(QString::fromLocal8Bit(exepath), parser.isSet(tray), parser.isSet(minst));
9494

95-
w.setFixedSize(w.geometry().width(), w.geometry().height());
95+
//w.setFixedSize(w.geometry().width(), w.geometry().height());
9696
w.setGeometry(
9797
QStyle::alignedRect(
9898
Qt::LeftToRight,

0 commit comments

Comments
 (0)