Fix corrupted display of application icon in Linux (#957)

A new ico file was created using imagemagick.
sirjuddington · Nov 19, 2018 · 00a4a2b · 00a4a2b
1 parent 402d99d
commit 00a4a2b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/dist/res/slade.ico b/dist/res/slade.ico
diff --git a/src/Application/App.cpp b/src/Application/App.cpp
@@ -686,6 +686,11 @@ bool App::useSFMLRenderWindow()
 #endif
 }
 
+const string App::getIcon()
+{
+	return "slade.ico";
+}
+
 std::thread::id App::mainThreadId()
 {
 	return main_thread_id;

diff --git a/src/Application/App.h b/src/Application/App.h
@@ -38,9 +38,10 @@ enum Platform
 	MacOS,
 	Unknown
 };
-Platform platform();
-bool     useWebView();
-bool     useSFMLRenderWindow();
+Platform     platform();
+bool         useWebView();
+bool         useSFMLRenderWindow();
+const string getIcon();
 
 std::thread::id mainThreadId();
 } // namespace App
diff --git a/src/MainEditor/UI/MainWindow.cpp b/src/MainEditor/UI/MainWindow.cpp
@@ -211,8 +211,8 @@ void MainWindow::setupLayout()
 	wxAuiPaneInfo p_inf;
 
 	// Set icon
-	string icon_filename = App::path("slade.ico", App::Dir::Temp);
-	App::archiveManager().programResourceArchive()->getEntry("slade.ico")->exportFile(icon_filename);
+	string icon_filename = App::path(App::getIcon(), App::Dir::Temp);
+	App::archiveManager().programResourceArchive()->getEntry(App::getIcon())->exportFile(icon_filename);
 	SetIcon(wxIcon(icon_filename, wxBITMAP_TYPE_ICO));
 	wxRemoveFile(icon_filename);
 
@@ -681,8 +681,8 @@ bool MainWindow::handleAction(string id)
 		info.SetDescription("It's a Doom Editor");
 
 		// Set icon
-		string icon_filename = App::path("slade.ico", App::Dir::Temp);
-		App::archiveManager().programResourceArchive()->getEntry("slade.ico")->exportFile(icon_filename);
+		string icon_filename = App::path(App::getIcon(), App::Dir::Temp);
+		App::archiveManager().programResourceArchive()->getEntry(App::getIcon())->exportFile(icon_filename);
 		info.SetIcon(wxIcon(icon_filename, wxBITMAP_TYPE_ICO));
 		wxRemoveFile(icon_filename);
 

diff --git a/src/MapEditor/UI/MapEditorWindow.cpp b/src/MapEditor/UI/MapEditorWindow.cpp
@@ -103,8 +103,8 @@ MapEditorWindow::MapEditorWindow() :
 	custom_menus_begin_ = 2;
 
 	// Set icon
-	string icon_filename = App::path("slade.ico", App::Dir::Temp);
-	App::archiveManager().programResourceArchive()->getEntry("slade.ico")->exportFile(icon_filename);
+	string icon_filename = App::path(App::getIcon(), App::Dir::Temp);
+	App::archiveManager().programResourceArchive()->getEntry(App::getIcon())->exportFile(icon_filename);
 	SetIcon(wxIcon(icon_filename, wxBITMAP_TYPE_ICO));
 	wxRemoveFile(icon_filename);
 

diff --git a/src/Scripting/UI/ScriptManagerWindow.cpp b/src/Scripting/UI/ScriptManagerWindow.cpp
@@ -308,8 +308,8 @@ void ScriptManagerWindow::setupLayout()
 	wxAuiPaneInfo p_inf;
 
 	// Set icon
-	auto icon_filename = App::path("slade.ico", App::Dir::Temp);
-	App::archiveManager().programResourceArchive()->getEntry("slade.ico")->exportFile(icon_filename);
+	auto icon_filename = App::path(App::getIcon(), App::Dir::Temp);
+	App::archiveManager().programResourceArchive()->getEntry(App::getIcon())->exportFile(icon_filename);
 	SetIcon(wxIcon(icon_filename, wxBITMAP_TYPE_ICO));
 	wxRemoveFile(icon_filename);