From 8dbc6af3ef6b92c85d6199cda8b62ab4ffe1f802 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Mon, 26 Feb 2018 16:47:44 +0000 Subject: [PATCH 1/2] linux eventlog: Fix background color --- SparkleShare/Linux/EventLog.cs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/SparkleShare/Linux/EventLog.cs b/SparkleShare/Linux/EventLog.cs index cbd23a91..427dd95c 100755 --- a/SparkleShare/Linux/EventLog.cs +++ b/SparkleShare/Linux/EventLog.cs @@ -167,24 +167,15 @@ namespace SparkleShare { html = html.Replace ("", "#009ff8"); html = html.Replace ("", "#0085cf"); - html = html.Replace ("", StyleContext.GetFont (StateFlags.Normal).Family); html = html.Replace ("", (double) (StyleContext.GetFont (StateFlags.Normal).Size / 1024 + 3) + "px"); html = html.Replace ("", UserInterfaceHelpers.RGBAToHex (StyleContext.GetColor (StateFlags.Normal))); - - // TODO - // html = html.Replace ("", - // UserInterfaceHelpers.RGBAToHex (new TreeView ().StyleContext.GetStyleProperty ("background-color"))); - + html = html.Replace ("",UserInterfaceHelpers.RGBAToHex (new TreeView ().StyleContext.GetBackgroundColor (StateFlags.Normal))); html = html.Replace ("", (StyleContext.GetFont (StateFlags.Normal).Size / 1024 + 3) + "px"); - html = html.Replace ("", - UserInterfaceHelpers.RGBAToHex (StyleContext.GetBackgroundColor (StateFlags.Normal))); - + html = html.Replace ("", UserInterfaceHelpers.RGBAToHex (StyleContext.GetBackgroundColor (StateFlags.Normal))); html = html.Replace ("", UserInterfaceHelpers.RGBAToHex (StyleContext.GetColor (StateFlags.Insensitive))); - html = html.Replace ("", UserInterfaceHelpers.RGBAToHex (StyleContext.GetColor (StateFlags.Insensitive))); html = html.Replace ("", "90%"); - html = html.Replace ("", pixmaps_path); html = html.Replace ("", "file://" + IO.Path.Combine (icons_path, "document-added.png")); html = html.Replace ("", "file://" + IO.Path.Combine (icons_path, "document-edited.png")); From f9db4bd7b31a0be1d3d937b16d52a2ce1f255f12 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Mon, 26 Feb 2018 16:50:27 +0000 Subject: [PATCH 2/2] linux eventlog: Remove not needed webview disposal/creation --- SparkleShare/Linux/EventLog.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/SparkleShare/Linux/EventLog.cs b/SparkleShare/Linux/EventLog.cs index 427dd95c..a6abdbfc 100755 --- a/SparkleShare/Linux/EventLog.cs +++ b/SparkleShare/Linux/EventLog.cs @@ -184,15 +184,14 @@ namespace SparkleShare { this.spinner.Stop (); this.scrolled_window.Remove (this.scrolled_window.Child); - this.web_view.Dispose (); - this.web_view = CreateWebView (); this.web_view.LoadHtml (html, "file:///"); this.scrolled_window.Add (this.web_view); this.content_wrapper.Remove (this.content_wrapper.Child); this.content_wrapper.Add (this.scrolled_window); + this.scrolled_window.ShowAll (); }