beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into fix/linux-main-loop

Browse source
This commit is contained in:
Hylke Bons 2018-02-11 16:58:57 +00:00 committed by GitHub
parent 3e74b2cb6f 44727f31f6
commit 1e3e595044
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
SparkleShare/Linux/UserInterface.cs
View file

@ -16,6 +16,7 @@
using System;
using System.IO;
using System.Reflection;
using Gtk;
@ -52,6 +53,8 @@ namespace SparkleShare
application.Register (null);
application.Activated += ApplicationActivatedDelegate;
IconTheme.Default.AppendSearchPath (Path.Combine (UserInterface.AssetsPath, "icons"));
var label = new Label ();
Gdk.Color color = UserInterfaceHelpers.RGBAToColor (label.StyleContext.GetColor (StateFlags.Insensitive));
SecondaryTextColor = UserInterfaceHelpers.ColorToHex (color);

2
SparkleShare/Linux/UserInterfaceHelpers.cs
View file

@ -27,7 +27,7 @@ namespace SparkleShare {
public static Gdk.Pixbuf GetIcon (string name, int size)
{
IconTheme icon_theme = new IconTheme ();
icon_theme.AppendSearchPath (Path.Combine (UserInterface.AssetsPath, "icons"));
icon_theme.AppendSearchPath (Path.Combine (UserInterface.AssetsPath, "icons"));
foreach (string search_path in IconTheme.Default.SearchPath)
icon_theme.AppendSearchPath (search_path);