Fixes for tkashkin#42, tkashkin#43

Fixed GameDetaisView/GameDetailsDialog background color for non-elementary gtk themes Former-commit-id: 8dc569a
Lucki · Aug 19, 2018 · 1556c0e · 1556c0e
1 parent b2c9814
commit 1556c0e
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 4 deletions.
diff --git a/data/GameHub.css b/data/GameHub.css
@@ -189,3 +189,14 @@ label.games-list-header
 	border-top: 1px alpha(#333, 0.3) solid;
 	border-bottom: 1px alpha(#333, 0.3) solid;
 }
+
+.gameinfo-background
+{
+	background-color: rgb(245, 245, 245);
+	color: rgb(66, 66, 66);
+}
+.gameinfo-background.dark
+{
+	background-color: rgb(59, 63, 69);
+	color: white;
+}
diff --git a/src/data/Game.vala b/src/data/Game.vala
@@ -100,8 +100,6 @@ namespace GameHub.Data
 
 					yield Utils.run_async(cmd, null, false, true);
 
-					Utils.run({"chmod", "-R", "+x", game.install_dir.get_path()});
-
 					try
 					{
 						string? dirname = null;
@@ -127,6 +125,8 @@ namespace GameHub.Data
 					}
 					catch(Error e){}
 
+					Utils.run({"chmod", "-R", "+x", game.install_dir.get_path()});
+
 					game.status = new Game.Status(game.executable.query_exists() ? Game.State.INSTALLED : Game.State.UNINSTALLED);
 				}
 				catch(IOError.CANCELLED e){}

diff --git a/src/data/sources/gog/GOGGame.vala b/src/data/sources/gog/GOGGame.vala
@@ -170,7 +170,8 @@ namespace GameHub.Data.Sources.GOG
 			if(is_installed())
 			{
 				var path = executable.get_path();
-				yield Utils.run_thread({path}, null, true);
+				var dir = executable.get_parent().get_path();
+				yield Utils.run_thread({path}, dir, true);
 			}
 		}
 

diff --git a/src/data/sources/humble/HumbleGame.vala b/src/data/sources/humble/HumbleGame.vala
@@ -181,6 +181,10 @@ namespace GameHub.Data.Sources.Humble
 				executable = chooser.get_file();
 				custom_info = @"{\"order\":\"$(order_id)\",\"executable\":\"$(executable.get_path())\"}";
 				status = new Game.Status(executable.query_exists() ? Game.State.INSTALLED : Game.State.UNINSTALLED);
+				if(executable.query_exists())
+				{
+					Utils.run({"chmod", "+x", executable.get_path()});
+				}
 				GamesDB.get_instance().add_game(this);
 			}
 
@@ -192,7 +196,8 @@ namespace GameHub.Data.Sources.Humble
 			if(is_installed())
 			{
 				var path = executable.get_path();
-				yield Utils.run_thread({path}, null, true);
+				var dir = executable.get_parent().get_path();
+				yield Utils.run_thread({path}, dir, true);
 			}
 		}
 

diff --git a/src/ui/dialogs/GameDetailsDialog.vala b/src/ui/dialogs/GameDetailsDialog.vala
@@ -29,6 +29,14 @@ namespace GameHub.UI.Dialogs
 				}
 			});
 
+			get_style_context().add_class("gameinfo-background");
+			var ui_settings = GameHub.Settings.UI.get_instance();
+			ui_settings.notify["dark-theme"].connect(() => {
+				get_style_context().remove_class("dark");
+				if(ui_settings.dark_theme) get_style_context().add_class("dark");
+			});
+			ui_settings.notify_property("dark-theme");
+
 			add_button(_("Close"), ResponseType.CLOSE).margin_end = 7;
 			show_all();
 		}

diff --git a/src/ui/views/GameDetailsView/GameDetailsView.vala b/src/ui/views/GameDetailsView/GameDetailsView.vala
@@ -61,6 +61,14 @@ namespace GameHub.UI.Views.GameDetailsView
 				if(page != null) page.update();
 			});
 
+			get_style_context().add_class("gameinfo-background");
+			var ui_settings = GameHub.Settings.UI.get_instance();
+			ui_settings.notify["dark-theme"].connect(() => {
+				get_style_context().remove_class("dark");
+				if(ui_settings.dark_theme) get_style_context().add_class("dark");
+			});
+			ui_settings.notify_property("dark-theme");
+
 			Idle.add(update);
 		}