Qt: Fix low-resolution icon

dolphin-emu · Mar 27, 2018 · b7ea881 · b7ea881
1 parent 5c83e18
commit b7ea881
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -805,7 +805,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD|OpenBSD")
   install(FILES Data/dolphin-emu.svg
           DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps)
   install(FILES Data/dolphin-emu.png
-          DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps)
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps)
   install(FILES Data/dolphin-emu.desktop
           DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
   # Install manpages

diff --git a/Data/dolphin-emu.png b/Data/dolphin-emu.png
diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp
@@ -85,7 +85,7 @@
 MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters) : QMainWindow(nullptr)
 {
   setWindowTitle(QString::fromStdString(Common::scm_rev_str));
-  setWindowIcon(QIcon(Resources::GetMisc(Resources::LOGO_SMALL)));
+  setWindowIcon(Resources::GetAppIcon());
   setUnifiedTitleAndToolBarOnMac(true);
   setAcceptDrops(true);
 

diff --git a/Source/Core/DolphinQt2/Resources.cpp b/Source/Core/DolphinQt2/Resources.cpp
@@ -128,3 +128,13 @@ QPixmap Resources::GetMisc(int id)
 {
   return m_misc[id];
 }
+
+QIcon Resources::GetAppIcon()
+{
+  QIcon icon;
+
+  icon.addPixmap(GetScaledPixmap("dolphin_logo"));
+  icon.addPixmap(GetScaledPixmap("Dolphin"));
+
+  return icon;
+}
diff --git a/Source/Core/DolphinQt2/Resources.h b/Source/Core/DolphinQt2/Resources.h
@@ -28,6 +28,7 @@ class Resources final
 
   static QIcon GetScaledIcon(const std::string& name);
   static QIcon GetScaledThemeIcon(const std::string& name);
+  static QIcon GetAppIcon();
 
   static QPixmap GetScaledPixmap(const std::string& name);
   static QPixmap GetScaledThemePixmap(const std::string& name);