From 6a0417a58b29d9f7e60e2496ceb130193850383d Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Thu, 15 Jun 2023 13:54:52 -0400 Subject: [PATCH] Set the window modality for the art detail window --- ArtDetailWindow.cpp | 4 +++- ArtDetailWindow.h | 6 +++--- MainWindow.cpp | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ArtDetailWindow.cpp b/ArtDetailWindow.cpp index 252a231..f9c8380 100644 --- a/ArtDetailWindow.cpp +++ b/ArtDetailWindow.cpp @@ -14,9 +14,11 @@ #include #include -ArtDetailWindow::ArtDetailWindow(const QString& filename, const QString& assetDirectory) : QWidget() { +ArtDetailWindow::ArtDetailWindow(const QString& filename, const QString& assetDirectory, QWidget* parent) : QDialog(parent) { setMinimumWidth(800); setMinimumHeight(600); + setWindowModality(Qt::WindowModality::WindowModal); + setWindowTitle(filename); QFileInfo info(filename); QString withoutExtension = info.completeBaseName(); diff --git a/ArtDetailWindow.h b/ArtDetailWindow.h index f16befa..3f1c800 100644 --- a/ArtDetailWindow.h +++ b/ArtDetailWindow.h @@ -7,11 +7,11 @@ #include #include #include -#include +#include -class ArtDetailWindow : public QWidget { +class ArtDetailWindow : public QDialog { public: - ArtDetailWindow(const QString& filename, const QString& assetDirectory); + ArtDetailWindow(const QString& filename, const QString& assetDirectory, QWidget* parent = nullptr); private: void loadData(const QString& filename); diff --git a/MainWindow.cpp b/MainWindow.cpp index fccb1a8..5f5d6a5 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -23,11 +23,11 @@ MainWindow::MainWindow(const QString& definitionDirectory, const QString& assetD QHeaderView *horizontalHeader = pieceListView->horizontalHeader(); horizontalHeader->setSectionResizeMode(QHeaderView::ResizeToContents); - connect(pieceListView, &QListView::clicked, this, [assetDirectory](QModelIndex index) { + connect(pieceListView, &QListView::clicked, this, [this, assetDirectory](QModelIndex index) { const QString filename = index.data(Qt::UserRole + 1).toString(); const QJsonObject object = index.data(Qt::UserRole).toJsonObject(); - auto window = new ArtDetailWindow(filename, assetDirectory); + auto window = new ArtDetailWindow(filename, assetDirectory, this); window->show(); });