Qt: allow creating multiple sprite viewer windows.

src/platform/qt/CMakeLists.txt

@@ -15,6 +15,7 @@ set(SOURCES
   src/widget/palette_box.cpp
   src/widget/palette_viewer_window.cpp
   src/widget/sprite_viewer.cpp
+  src/widget/sprite_viewer_window.cpp
   src/config.cpp
   src/main.cpp
 )
@@ -29,6 +30,7 @@ set(HEADERS
   src/widget/palette_viewer_window.hpp
   src/widget/screen.hpp
   src/widget/sprite_viewer.hpp
+  src/widget/sprite_viewer_window.hpp
   src/config.hpp
   version.in.hpp
 )

src/platform/qt/src/widget/main_window.cpp

@@ -400,11 +400,8 @@ void MainWindow::CreateToolsMenu() {
   });
 
   connect(tools_menu->addAction(tr("Sprite Viewer")), &QAction::triggered, [this]() {
-    if(!sprite_viewer_window) {
-      sprite_viewer_window = new SpriteViewer{core.get()};
-      connect(screen.get(), &Screen::RequestDraw, sprite_viewer_window, &SpriteViewer::Update);
-    }
-
+    const auto sprite_viewer_window = new SpriteViewerWindow{core.get(), this};
+    connect(screen.get(), &Screen::RequestDraw, sprite_viewer_window, &SpriteViewerWindow::Update);
     sprite_viewer_window->show();
   });
 }

src/platform/qt/src/widget/main_window.hpp

@@ -27,7 +27,7 @@
 #include "widget/input_window.hpp"
 #include "widget/palette_viewer_window.hpp"
 #include "widget/screen.hpp"
-#include "widget/sprite_viewer.hpp"
+#include "widget/sprite_viewer_window.hpp"
 #include "config.hpp"
 
 struct MainWindow : QMainWindow {
@@ -153,7 +153,6 @@ private slots:
 
   PaletteViewerWindow* palette_viewer_window;
   BackgroundViewerWindow* background_viewer_window;
-  SpriteViewer* sprite_viewer_window;
 
   QString base_window_title;
 

src/platform/qt/src/widget/sprite_viewer.cpp

@@ -104,10 +104,6 @@ SpriteViewer::SpriteViewer(nba::CoreBase* core, QWidget* parent) : QWidget{paren
   atlas_canvas->installEventFilter(this);
 
   setLayout(layout);
-
-  // @todo: move this out of here
-  setWindowTitle("Sprite Viewer");
-  setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 }
 
 void SpriteViewer::Update() {

src/platform/qt/src/widget/sprite_viewer.hpp

@@ -22,7 +22,6 @@ struct SpriteViewer : QWidget {
 
   bool eventFilter(QObject* object, QEvent* event) override;
 
-public slots:
   void Update();
 
 private:

src/platform/qt/src/widget/sprite_viewer_window.cpp

@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2023 fleroviux
+ *
+ * Licensed under GPLv3 or any later version.
+ * Refer to the included LICENSE file.
+ */
+
+#include <QVBoxLayout>
+
+#include "sprite_viewer_window.hpp"
+
+SpriteViewerWindow::SpriteViewerWindow(nba::CoreBase* core, QWidget* parent) : QDialog(parent) {
+  sprite_viewer = new SpriteViewer{core, this};
+
+  setWindowTitle(tr("Sprite Viewer"));
+  setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+}
+
+void SpriteViewerWindow::Update() {
+  if(!isVisible()) {
+    return;
+  }
+  sprite_viewer->Update();
+}

src/platform/qt/src/widget/sprite_viewer_window.hpp

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2023 fleroviux
+ *
+ * Licensed under GPLv3 or any later version.
+ * Refer to the included LICENSE file.
+ */
+
+#pragma once
+
+#include <nba/core.hpp>
+#include <QDialog>
+#include <QLabel>
+
+#include "widget/sprite_viewer.hpp"
+
+struct SpriteViewerWindow : QDialog {
+  SpriteViewerWindow(nba::CoreBase* core, QWidget* parent = nullptr);
+
+public slots:
+  void Update();
+
+private:
+  SpriteViewer* sprite_viewer;
+
+  Q_OBJECT
+};