aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSulfurNitride <SulfurNitride@users.noreply.github.com>2026-03-12 13:48:25 -0500
committerSulfurNitride <SulfurNitride@users.noreply.github.com>2026-03-12 13:48:25 -0500
commit84a43a2e6afbdfab92c610d47aa75e3876ffacd6 (patch)
treeea624ec287181905441fbf1247c645976bdb8fc9 /src
parent3ba283d9350783c038cc2844450f4938ad125f08 (diff)
Replace wrestool with native Rust PE icon extraction (pelite)
- Add icons.rs to nak crate: parses PE resource sections, extracts RT_GROUP_ICON/RT_ICON and builds ICO files in memory - Expose nak_extract_exe_icon() FFI for C++ consumption - Update iconForExecutable() to use Rust FFI instead of shelling out to wrestool; reads all ICO entries for correct color depth - Fix BasicGamePlugin::gameIcon() to call iconForExecutable() (was returning empty QIcon, causing placeholder icons for BG3/Cyberpunk) - Move app icon setup: setDesktopFileName + setWindowIcon to MOApplication constructor (fixes Wayland taskbar/decoration icon) - Move data/com.fluorine.* to data/icons/, install to XDG paths at launch for Wayland compositor icon resolution - Remove icoutils dependency from Docker image and build output Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Diffstat (limited to 'src')
-rw-r--r--src/src/mainwindow.cpp3
-rw-r--r--src/src/moapplication.cpp2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/src/mainwindow.cpp b/src/src/mainwindow.cpp
index c6d119b..457a3dd 100644
--- a/src/src/mainwindow.cpp
+++ b/src/src/mainwindow.cpp
@@ -263,7 +263,8 @@ MainWindow::MainWindow(Settings& settings, OrganizerCore& organizerCore,
QApplication::setEffectEnabled(Qt::UI_AnimateCombo, false);
QApplication::setEffectEnabled(Qt::UI_AnimateTooltip, false);
QApplication::setEffectEnabled(Qt::UI_FadeTooltip, false);
- QApplication::setDesktopFileName(QString("com.fluorine.manager"));
+ // setDesktopFileName moved to MOApplication constructor (must be set before
+ // first window surface for Wayland app_id to take effect)
#ifdef MO2_WEBENGINE
QWebEngineProfile::defaultProfile()->setPersistentCookiesPolicy(
diff --git a/src/src/moapplication.cpp b/src/src/moapplication.cpp
index 3009a45..45b79a8 100644
--- a/src/src/moapplication.cpp
+++ b/src/src/moapplication.cpp
@@ -229,6 +229,8 @@ MOApplication::MOApplication(int& argc, char** argv) : QApplication(argc, argv)
// Ensure the app name is always "ModOrganizer" regardless of the binary
// filename (e.g. "ModOrganizer.bin" inside an AppImage).
setApplicationName("ModOrganizer");
+ setDesktopFileName(QStringLiteral("com.fluorine.manager"));
+ setWindowIcon(QIcon(":/MO/gui/app_icon"));
qputenv("QML_DISABLE_DISK_CACHE", "true");