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

linux ui: Fix crash with multiple (crashed) instances

Browse source
This commit is contained in:
Hylke Bons 2018-07-09 15:09:57 +02:00
parent 84a149ad2a
commit ae97418566
2 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
SparkleShare/Linux/UserInterface.cs
View file

@ -35,8 +35,8 @@ namespace SparkleShare
public About About;
public Note Note;
public readonly string SecondaryTextColor;
public readonly string SecondaryTextColorSelected;
public string SecondaryTextColor;
public string SecondaryTextColorSelected;
Application application;
@ -47,25 +47,12 @@ namespace SparkleShare
Logger.LogInfo ("Environment", "GTK+ " + gtk_version);
application = new Application ("org.sparkleshare.SparkleShare", GLib.ApplicationFlags.None);
application.Register (null);
application.Activated += ApplicationActivatedDelegate;
if (IconTheme.Default != null)
IconTheme.Default.AppendSearchPath (Path.Combine (UserInterface.AssetsPath, "icons"));
if (!application.IsRemote)
return;
var label = new Label ();
Gdk.Color color = UserInterfaceHelpers.RGBAToColor (label.StyleContext.GetColor (StateFlags.Insensitive));
SecondaryTextColor = UserInterfaceHelpers.ColorToHex (color);
var tree_view = new TreeView ();
color = UserInterfaceHelpers.MixColors (
UserInterfaceHelpers.RGBAToColor (tree_view.StyleContext.GetColor (StateFlags.Selected)),
UserInterfaceHelpers.RGBAToColor (tree_view.StyleContext.GetBackgroundColor (StateFlags.Selected)),
0.39);
SecondaryTextColorSelected = UserInterfaceHelpers.ColorToHex (color);
application.Register (null);
}
@ -143,6 +130,9 @@ namespace SparkleShare
return;
}
if (IconTheme.Default != null)
IconTheme.Default.AppendSearchPath (Path.Combine (UserInterface.AssetsPath, "icons"));
Setup = new Setup ();
EventLog = new EventLog ();
About = new About ();
@ -155,7 +145,24 @@ namespace SparkleShare
About.Application = application;
Note.Application = application;
DetectTextColors ();
SparkleShare.Controller.UIHasLoaded ();
}
void DetectTextColors ()
{
Gdk.Color text_color = UserInterfaceHelpers.RGBAToColor (new Label ().StyleContext.GetColor (StateFlags.Insensitive));
var tree_view_style = new TreeView ().StyleContext;
Gdk.Color text_color_selected = UserInterfaceHelpers.MixColors (
UserInterfaceHelpers.RGBAToColor (tree_view_style.GetColor (StateFlags.Selected)),
UserInterfaceHelpers.RGBAToColor (tree_view_style.GetBackgroundColor (StateFlags.Selected)),
0.25);
SecondaryTextColor = UserInterfaceHelpers.ColorToHex (text_color);
SecondaryTextColorSelected = UserInterfaceHelpers.ColorToHex (text_color_selected);
}
}
}

2
SparkleShare/Linux/sparkleshare.in
View file

@ -21,7 +21,7 @@ case $1 in
echo
echo "Options:"
echo " --open sparkleshare://URL Open invite file at URL"
echo " --status-icon=[appindicator|gtk] Use a specific status icon implementation."
echo " --status-icon=[appindicator|gtk] Use a specific status icon implementation"
;;
*)
mono "@ABS_INSTALL_DIR@/SparkleShare.exe" $@