Bug fix 🦩

- Added MainWindow parent to popups, to prevent popups from: 1) being affected by AOT; and 2) popping up anywhere other than centered over the MainWindow

Author: fairybow

Fernanda/docs/To-do.md

@@ -149,7 +149,7 @@
 - [ ] May need to remove and re-add icons / labels. They seem to be doubling up sometimes--visible r/g/b or pink outlines?
 
 ### Popup
-- [ ] Ensure popups happen on the same monitor...
+- [x] ~~Ensure popups happen on the same monitor...~~
 
 ### Preview
 - [ ] Need a default size to open to from toggle if not set (-1)

Fernanda/source/MainWindow.cpp

@@ -69,7 +69,7 @@ bool MainWindow::confirmStoryClose(bool isQuit)
 {
     if (!activeStory.has_value() || !activeStory.value().hasChanges()) return true;
     auto result = false;
-    switch (Popup::confirm(isQuit)) {
+    switch (Popup::confirm(this, isQuit)) {
     case Popup::OnClose::Close:
         result = true;
         break;
@@ -531,7 +531,7 @@ void MainWindow::makeHelpMenu()
             helpMenuUpdate();
         });
     connect(check_for_updates, &QAction::triggered, this, &MainWindow::helpMenuUpdate);
-    connect(shortcuts, &QAction::triggered, this, [&]() { Popup::shortcuts(); });
+    connect(shortcuts, &QAction::triggered, this, [&]() { Popup::shortcuts(this); });
     connect(documents, &QAction::triggered, this, [&]()
         {
             openLocalFolder(UserData::doThis(UserData::Operation::GetDocuments));
@@ -828,7 +828,7 @@ void MainWindow::storyMenuTotals()
     auto& story = activeStory.value();
     story.autoTempSave(editor->toPlainText());
     auto totals = story.totalCounts();
-    Popup::totalCounts(totals.lines, totals.words, totals.characters);
+    Popup::totalCounts(this, totals.lines, totals.words, totals.characters);
 }
 
 void MainWindow::helpMenuMakeSampleProject()
@@ -842,7 +842,7 @@ void MainWindow::helpMenuMakeSampleRes()
     auto path = UserData::doThis(UserData::Operation::GetUserData);
     Sample::makeRc(path);
     colorBar->run(ColorBar::Run::Pastels);
-    switch (Popup::sample()) {
+    switch (Popup::sample(this)) {
     case Popup::Action::Accept:
         break;
     case Popup::Action::Open:
@@ -871,7 +871,7 @@ void MainWindow::helpMenuUpdate()
             }
             else
                 result = Text::VersionCheck::Error;
-            Popup::update(result, latest);
+            Popup::update(this, result, latest);
         });
 }
 

Fernanda/source/Popup.cpp

@@ -16,7 +16,7 @@
 bool Popup::about(QWidget* parent)
 {
     auto result = false;
-    QMessageBox about;
+    QMessageBox about(parent);
     box(about, Text::about(), true, true);
     auto update = about.addButton(tr(Text::checkForUpdates().toLocal8Bit()), QMessageBox::AcceptRole);
     auto qt = about.addButton(tr("About Qt"), QMessageBox::AcceptRole);
@@ -26,10 +26,10 @@ bool Popup::about(QWidget* parent)
     return result;
 }
 
-Popup::OnClose Popup::confirm(bool isQuit)
+Popup::OnClose Popup::confirm(QWidget* parent, bool isQuit)
 {
     auto result = OnClose::Close;
-    QMessageBox alert;
+    QMessageBox alert(parent);
     box(alert, Text::change(isQuit), false, false, "Hey!");
     alert.addButton(QMessageBox::Yes);
     auto no = alert.addButton(QMessageBox::No);
@@ -41,45 +41,45 @@ Popup::OnClose Popup::confirm(bool isQuit)
     return result;
 }
 
-void Popup::shortcuts()
+void Popup::shortcuts(QWidget* parent)
 {
-    QMessageBox shortcuts;
+    QMessageBox shortcuts(parent);
     box(shortcuts, Text::shortcuts());
     shortcuts.exec();
 }
 
-Popup::Action Popup::sample()
+Popup::Action Popup::sample(QWidget* parent)
 {
-    QMessageBox alert;
+    QMessageBox alert(parent);
     box(alert, Text::samples(), true, false, "Hey!");
     auto open = alert.addButton(tr(Text::openUdButton().toLocal8Bit()), QMessageBox::AcceptRole);
     alert.exec();
     if (alert.clickedButton() == open) return Action::Open;
     return Action::Accept;
 }
 
-void Popup::update(Text::VersionCheck result, QString latestVersion)
+void Popup::update(QWidget* parent, Text::VersionCheck result, QString latestVersion)
 {
-    QMessageBox version_check;
+    QMessageBox version_check(parent);
     box(version_check, Text::version(result, latestVersion), true, true);
     version_check.exec();
 }
 
-void Popup::timeUp()
+void Popup::timeUp(QWidget* parent)
 {
-    QMessageBox time_up;
+    QMessageBox time_up(parent);
     box(time_up, Text::timeUp());
     time_up.exec();
 }
 
-void Popup::totalCounts(int lines, int words, int characters)
+void Popup::totalCounts(QWidget* parent, int lines, int words, int characters)
 {
-    QMessageBox total_counts;
+    QMessageBox total_counts(parent);
     box(total_counts, Text::totalCounts(lines, words, characters));
     total_counts.exec();
 }
 
-void Popup::box(QMessageBox& box, QString text, bool hasOk, bool hasIcon, QString title, QWidget* parent)
+void Popup::box(QMessageBox& box, QString text, bool hasOk, bool hasIcon, QString title)
 {
     (title == nullptr)
         ? box.setWindowTitle("Fernanda")

Fernanda/source/Popup.h

@@ -38,15 +38,15 @@ class Popup : public QObject
     };
 
     static bool about(QWidget* parent);
-    static OnClose confirm(bool isQuit);
-    static void shortcuts();
-    static Action sample();
-    static void update(Text::VersionCheck result, QString latestVersion);
-    static void timeUp();
-    static void totalCounts(int lines, int words, int characters);
+    static OnClose confirm(QWidget* parent, bool isQuit);
+    static void shortcuts(QWidget* parent);
+    static Action sample(QWidget* parent);
+    static void update(QWidget* parent, Text::VersionCheck result, QString latestVersion);
+    static void timeUp(QWidget* parent);
+    static void totalCounts(QWidget* parent, int lines, int words, int characters);
 
 private:
-    static void box(QMessageBox& box, QString text, bool hasOk = true, bool hasIcon = false, QString title = nullptr, QWidget* parent = nullptr);
+    static void box(QMessageBox& box, QString text, bool hasOk = true, bool hasIcon = false, QString title = nullptr);
 };
 
 // Popup.h, Fernanda

Fernanda/source/Tool.cpp

@@ -158,7 +158,7 @@ void Tool::countdownDisplay()
     setText(Text::pad(Icon::draw(Icon::Name::Timer) + " " + time(countdown_value), 2));
     if (countdown_value < 1)
     {
-        Popup::timeUp();
+        Popup::timeUp(parentWindow);
         setChecked(false);
         return;
     }

Fernanda/source/Version.h

@@ -13,8 +13,8 @@
 
 #pragma once
 
-#define VER_FILEVERSION             0,26,1,57
-#define VER_FILEVERSION_STR         "v0.26.1-beta57"
+#define VER_FILEVERSION             0,26,2,58
+#define VER_FILEVERSION_STR         "v0.26.2-beta58"
 #define VER_PRODUCTVERSION          VER_FILEVERSION
 #define VER_PRODUCTVERSION_STR      VER_FILEVERSION_STR
 #define VER_COMPANYNAME_STR         "fairybow"

README.md

@@ -183,7 +183,7 @@ Fernanda comes with several two-tone editor themes inspired by retro displays an
 **Tools:**
 <a id="features-tools"></a>
 - :pushpin: **Always on top:**
-	- Pin Fernanda to the top of your window order (will interfere with popups!)
+	- Pin Fernanda to the top of your window order
 - :bubble_tea:	**Stay awake:**
 	- Keep the screen awake without input (Windows only)
 - :timer_clock: **Timer:**