aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSulfurNitride <SulfurNitride@users.noreply.github.com>2026-04-12 17:54:45 -0500
committerSulfurNitride <SulfurNitride@users.noreply.github.com>2026-04-12 17:54:45 -0500
commita0355c9b897281d0bfea48bec9d490724ecabd96 (patch)
tree42c56ea4f4829a6115f688956858ada3e59fd9ef /src
parentfa43a71f9d05b3673d42296a80decb2228d68f83 (diff)
Add NIF previewer plugin with Linux-specific fixes
Vendored from github.com/Parapets/mo2-preview_nif and adapted for Linux: - BSA texture resolution via MO2 virtual tree with case-insensitive fallback walk (Linux FS is case-sensitive; NIFs reference textures with arbitrary case against files on disk) - Process-wide cached BSA candidate list, keyed by profile path, priority-sorted, filtering disabled mods - Path backslash normalization before loose-file lookup - Polygon offset on SLSF1_Decal-flagged shapes to break z-ties with coincident base meshes (road decals, moss overlays) - Opaque framebuffer via glColorMask alpha lock so alpha-blended shapes can't bleed the dialog background through the preview area - QMouseEvent::globalPosition().toPoint() for Qt6 compatibility Preview dialog behavior (organizercore.cpp): - Switch previewFile and previewFileWithAlternatives from stack-allocated exec() to heap + ApplicationModal + show() + WA_DeleteOnClose. - Parent passed as nullptr so preview lifetime is decoupled from the stack-allocated ModInfoDialog that spawns it. Nested exec() inside the enclosing dialog's exec() was softlocking on close. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'src')
-rw-r--r--src/src/organizercore.cpp71
1 files changed, 61 insertions, 10 deletions
diff --git a/src/src/organizercore.cpp b/src/src/organizercore.cpp
index 0e1219d..810e4c2 100644
--- a/src/src/organizercore.cpp
+++ b/src/src/organizercore.cpp
@@ -54,6 +54,7 @@
#include <QNetworkInterface>
#include <QProcess>
#include <QRegularExpression>
+#include <QTemporaryFile>
#include <QTextStream>
#include <QTimer>
#include <QUrl>
@@ -1307,8 +1308,13 @@ bool OrganizerCore::previewFileWithAlternatives(QWidget* parent, QString fileNam
return false;
}
- // set up preview dialog
- PreviewDialog preview(fileName, parent);
+ // Standalone top-level window (no QObject parent) to decouple from the
+ // enclosing ModInfoDialog stack frame. ApplicationModal stacks it on
+ // top of any already-open modal dialog. WA_DeleteOnClose cleans up.
+ auto* preview = new PreviewDialog(fileName, nullptr);
+ preview->setAttribute(Qt::WA_DeleteOnClose);
+ preview->setWindowModality(Qt::ApplicationModal);
+ (void)parent;
auto addFunc = [&](int originId, std::wstring archiveName = L"") {
FilesOrigin& origin = directoryStructure()->getOriginByID(originId);
@@ -1321,7 +1327,7 @@ bool OrganizerCore::previewFileWithAlternatives(QWidget* parent, QString fileNam
if (wid == nullptr) {
reportError(tr("failed to generate preview for %1").arg(filePath));
} else {
- preview.addVariant(ToQString(origin.getName()), wid);
+ preview->addVariant(ToQString(origin.getName()), wid);
}
} else if (archiveName != L"") {
auto archiveFile = directoryStructure()->searchFile(archiveName);
@@ -1337,7 +1343,7 @@ bool OrganizerCore::previewFileWithAlternatives(QWidget* parent, QString fileNam
if (wid == nullptr) {
reportError(tr("failed to generate preview for %1").arg(filePath));
} else {
- preview.addVariant(ToQString(origin.getName()), wid);
+ preview->addVariant(ToQString(origin.getName()), wid);
}
} catch (std::exception& e) {
}
@@ -1382,10 +1388,13 @@ bool OrganizerCore::previewFileWithAlternatives(QWidget* parent, QString fileNam
}
}
- if (preview.numVariants() > 0) {
- preview.exec();
+ if (preview->numVariants() > 0) {
+ preview->show();
+ preview->raise();
+ preview->activateWindow();
return true;
} else {
+ delete preview;
QMessageBox::information(parent, tr("Sorry"),
tr("Sorry, can't preview anything. This function "
"currently does not support extracting from bsas."));
@@ -1402,17 +1411,59 @@ bool OrganizerCore::previewFile(QWidget* parent, const QString& originName,
return false;
}
- PreviewDialog preview(path, parent);
-
QWidget* wid = m_PluginContainer->previewGenerator().genPreview(path);
if (wid == nullptr) {
reportError(tr("Failed to generate preview for %1").arg(path));
return false;
}
- preview.addVariant(originName, wid);
- preview.exec();
+ // Standalone top-level window — no QObject parent so lifetime is
+ // decoupled from the enclosing ModInfoDialog (which is stack-allocated
+ // in modlistviewactions.cpp, so passing &dialog as parent makes preview
+ // a child of a stack object). ApplicationModal makes preview stack on
+ // top of the outer modal ModInfoDialog — newest modal wins. Without
+ // modality, ModInfoDialog blocks all input on the preview.
+ // WA_DeleteOnClose handles cleanup when user closes it.
+ auto* preview = new PreviewDialog(path, nullptr);
+ preview->setAttribute(Qt::WA_DeleteOnClose);
+ preview->setWindowModality(Qt::ApplicationModal);
+ preview->addVariant(originName, wid);
+ preview->show();
+ preview->raise();
+ preview->activateWindow();
+ (void)parent;
+
+ return true;
+}
+
+bool OrganizerCore::previewFileData(QWidget* parent, const QString& fileName,
+ const QByteArray& fileData)
+{
+ if (fileData.isEmpty()) {
+ return false;
+ }
+
+ const QString ext = QFileInfo(fileName).suffix().toLower();
+ if (!m_PluginContainer->previewGenerator().previewSupported(ext, true)) {
+ return false;
+ }
+
+ QWidget* wid =
+ m_PluginContainer->previewGenerator().genArchivePreview(fileData, fileName);
+ if (wid == nullptr) {
+ return false;
+ }
+ // Use QDialog::open() instead of exec(). open() is async window-modal —
+ // it shows the dialog modal to its parent but returns immediately without
+ // starting a nested QEventLoop. Nesting exec() inside a caller that's
+ // itself running in QDialog::exec() (mod info filetree → preview_bsa file
+ // tree → nif preview) has been causing event-loop unwinding to softlock
+ // on close. WA_DeleteOnClose cleans up automatically.
+ auto* preview = new PreviewDialog(fileName, parent);
+ preview->setAttribute(Qt::WA_DeleteOnClose);
+ preview->addVariant(QFileInfo(fileName).fileName(), wid);
+ preview->open();
return true;
}