From d3c1a6414d16537bb12ddc4b12ae7117baf50979 Mon Sep 17 00:00:00 2001
From: Mathieu Comandon <strycore@gmail.com>
Date: Sat, 25 Jul 2020 17:19:01 -0700
Subject: [PATCH] Fix color icon loading, relocate gi_composites shim

---
 lutris/gui/lutriswindow.py                      | 11 ++++-------
 lutris/{vendor => gui/widgets}/gi_composites.py |  0
 lutris/gui/widgets/sidebar.py                   | 11 ++---------
 lutris/gui/widgets/utils.py                     | 10 +++++++++-
 lutris/util/resources.py                        |  5 +----
 5 files changed, 16 insertions(+), 21 deletions(-)
 rename lutris/{vendor => gui/widgets}/gi_composites.py (100%)

diff --git a/lutris/gui/lutriswindow.py b/lutris/gui/lutriswindow.py
index 058861f17e..c968b6fcd5 100644
--- a/lutris/gui/lutriswindow.py
+++ b/lutris/gui/lutriswindow.py
@@ -22,6 +22,7 @@
 from lutris.gui.views.list import GameListView
 from lutris.gui.views.menu import ContextualMenu
 from lutris.gui.views.store import GameStore
+from lutris.gui.widgets.gi_composites import GtkTemplate
 from lutris.gui.widgets.services import SyncServiceWindow
 from lutris.gui.widgets.sidebar import SidebarListBox
 from lutris.gui.widgets.utils import IMAGE_SIZES, open_uri
@@ -31,7 +32,6 @@
 from lutris.util import datapath, http
 from lutris.util.jobs import AsyncCall
 from lutris.util.log import logger
-from lutris.vendor.gi_composites import GtkTemplate
 
 # from lutris.util.steam.watcher import SteamWatcher
 
@@ -196,12 +196,9 @@ def _init_actions(self):
             Action(self.on_add_game_button_clicked),
             "preferences":
             Action(self.on_preferences_activate),
-            "manage-runners":
-            Action(self.on_manage_runners),
-            "about":
-            Action(self.on_about_clicked),
-            "show-installed-only":
-            Action(
+            "manage-runners": Action(self.on_manage_runners, ),
+            "about": Action(self.on_about_clicked),
+            "show-installed-only": Action(
                 self.on_show_installed_state_change,
                 type="b",
                 default=self.filter_installed,
diff --git a/lutris/vendor/gi_composites.py b/lutris/gui/widgets/gi_composites.py
similarity index 100%
rename from lutris/vendor/gi_composites.py
rename to lutris/gui/widgets/gi_composites.py
diff --git a/lutris/gui/widgets/sidebar.py b/lutris/gui/widgets/sidebar.py
index 1fd747873e..399ebd5b42 100644
--- a/lutris/gui/widgets/sidebar.py
+++ b/lutris/gui/widgets/sidebar.py
@@ -1,10 +1,10 @@
 """Sidebar for the main window"""
-import os
 from gettext import gettext as _
 
 from gi.repository import GObject, Gtk, Pango
 
-from lutris import pga, platforms, runners, settings
+from lutris import pga, platforms, runners
+from lutris.gui.widgets.utils import load_icon_theme
 from lutris.game import Game
 from lutris.gui.config.runner import RunnerConfigDialog
 from lutris.gui.dialogs.runner_install import RunnerInstallDialog
@@ -17,13 +17,6 @@
 GAMECOUNT = 4
 
 
-def load_icon_theme():
-    """Add the lutris icon folder to the default theme"""
-    icon_theme = Gtk.IconTheme.get_default()
-    local_theme_path = os.path.join(settings.RUNTIME_DIR, "icons")
-    if local_theme_path not in icon_theme.get_search_path():
-        icon_theme.prepend_search_path(local_theme_path)
-
 
 class SidebarRow(Gtk.ListBoxRow):
 
diff --git a/lutris/gui/widgets/utils.py b/lutris/gui/widgets/utils.py
index 9efd5e0f1c..fed1d2a748 100644
--- a/lutris/gui/widgets/utils.py
+++ b/lutris/gui/widgets/utils.py
@@ -86,7 +86,7 @@ def get_icon(icon_name, icon_format="image", size=None, icon_type="runner"):
     icon_type -- Retrieve either a 'runner' or 'platform' icon (default 'runner')
     """
     filename = icon_name.lower().replace(" ", "") + ".png"
-    icon_path = os.path.join(datapath.get(), "media/" + icon_type + "_icons", filename)
+    icon_path = os.path.join(settings.RUNTIME_DIR, "icons/hicolor/64x64/apps", filename)
     if not os.path.exists(icon_path):
         logger.error("Unable to find icon '%s'", icon_path)
         return None
@@ -214,3 +214,11 @@ def get_link_button(text):
     button.get_style_context().add_class("panel-button")
     button.set_size_request(-1, 24)
     return button
+
+
+def load_icon_theme():
+    """Add the lutris icon folder to the default theme"""
+    icon_theme = Gtk.IconTheme.get_default()
+    local_theme_path = os.path.join(settings.RUNTIME_DIR, "icons")
+    if local_theme_path not in icon_theme.get_search_path():
+        icon_theme.prepend_search_path(local_theme_path)
diff --git a/lutris/util/resources.py b/lutris/util/resources.py
index 498890db31..29c9a14ba8 100644
--- a/lutris/util/resources.py
+++ b/lutris/util/resources.py
@@ -1,11 +1,8 @@
 """Utility module to handle media resources"""
-# Standard Library
 import os
 
-# Third Party Libraries
-from gi.repository import GLib
+from gi.repository import GLib, Gtk
 
-# Lutris Modules
 from lutris import settings
 from lutris.util import system
 from lutris.util.http import HTTPError, Request