From 17756f8337bc71abf10aa0e7612dc31f2e0a588a Mon Sep 17 00:00:00 2001 From: SulfurNitride Date: Fri, 1 May 2026 01:17:29 -0500 Subject: Port upstream PR #2368: preview parent widget fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cherry-picked the three preview-parent fixes from #2368: parentWidget() in ConflictsTab/FileTreeTab/ImagesTab returns the tab widget itself, not the dialog — preview windows ended up parented to the wrong widget. m_parent->parentWidget() returns the actual mod info dialog so previews position and z-order correctly. Skipped the Starfield blueprint feature from the same PR — requires coordinated changes across uibase (add IPluginGame::blueprintPrefix) and modorganizer-game_bethesda (Starfield override). See project_upstream_pending_prs.md. Co-Authored-By: Claude Opus 4.7 (1M context) --- src/src/modinfodialogconflicts.cpp | 2 +- src/src/modinfodialogfiletree.cpp | 2 +- src/src/modinfodialogimages.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/src/modinfodialogconflicts.cpp b/src/src/modinfodialogconflicts.cpp index 05406f2..458126e 100644 --- a/src/src/modinfodialogconflicts.cpp +++ b/src/src/modinfodialogconflicts.cpp @@ -249,7 +249,7 @@ void ConflictsTab::previewItems(QTreeView* tree) void ConflictsTab::previewItem(const ConflictItem* item) { - core().previewFileWithAlternatives(parentWidget(), item->fileName()); + core().previewFileWithAlternatives(m_parent->parentWidget(), item->fileName()); } void ConflictsTab::exploreItems(QTreeView* tree) diff --git a/src/src/modinfodialogfiletree.cpp b/src/src/modinfodialogfiletree.cpp index 187fff5..5b5208b 100644 --- a/src/src/modinfodialogfiletree.cpp +++ b/src/src/modinfodialogfiletree.cpp @@ -224,7 +224,7 @@ void FileTreeTab::onPreview() return; } - core().previewFile(parentWidget(), mod().name(), m_fs->filePath(selection)); + core().previewFile(m_parent->parentWidget(), mod().name(), m_fs->filePath(selection)); } void FileTreeTab::onExplore() diff --git a/src/src/modinfodialogimages.cpp b/src/src/modinfodialogimages.cpp index 7774e7c..617343d 100644 --- a/src/src/modinfodialogimages.cpp +++ b/src/src/modinfodialogimages.cpp @@ -593,7 +593,8 @@ void ImagesTab::onShowDDS() void ImagesTab::onPreviewButton() { - core().previewFileWithAlternatives(parentWidget(), m_files.selectedFile()->path()); + core().previewFileWithAlternatives(m_parent->parentWidget(), + m_files.selectedFile()->path()); } void ImagesTab::onFilterChanged() -- cgit v1.3.1