From 69e4bc2650b949258320b702a47b6b7fd0c7c14b Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Mon, 1 Jul 2019 21:56:39 +0200 Subject: [PATCH] set html colors of about screen based on current color theme, fixes #1505 --- mRemoteV1/UI/Window/AboutWindow.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mRemoteV1/UI/Window/AboutWindow.cs b/mRemoteV1/UI/Window/AboutWindow.cs index 7dee515e..d1b9356f 100644 --- a/mRemoteV1/UI/Window/AboutWindow.cs +++ b/mRemoteV1/UI/Window/AboutWindow.cs @@ -68,9 +68,6 @@ namespace mRemoteNG.UI.Window { try { - var pipeline = new MarkdownPipelineBuilder().UseAdvancedExtensions().Build(); - var backgroundColor = ColorTranslator.ToHtml(ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Dialog_Background")); - // AppVeyor seems to pull text files in UNIX format... This messes up the display on the about screen... // // This would be MUCH faster: @@ -84,6 +81,12 @@ namespace mRemoteNG.UI.Window if (!File.Exists(GeneralAppInfo.HomePath + @"\CREDITS.md") && !File.Exists(GeneralAppInfo.HomePath + @"\CHANGELOG.md")) return; + var pipeline = new MarkdownPipelineBuilder().UseAdvancedExtensions().Build(); + var backgroundColor = ColorTranslator.ToHtml(ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Dialog_Background")); + var foregroundColor = ColorTranslator.ToHtml(ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Dialog_Foreground")); + var css = + $@""; + var changelog = ""; using (var sR = new StreamReader(GeneralAppInfo.HomePath + @"\CHANGELOG.md", Encoding.UTF8, true)) { @@ -100,11 +103,11 @@ namespace mRemoteNG.UI.Window } } var changelogHtml = Markdown.ToHtml(changelog, pipeline); - changelogHtml = $"{changelogHtml}"; + changelogHtml = css + $"{changelogHtml}"; var credits = new StreamReader(GeneralAppInfo.HomePath + @"\CREDITS.md", Encoding.UTF8, true).ReadToEnd(); var creditsHtml = Markdown.ToHtml(credits, pipeline); - creditsHtml = $"{creditsHtml}"; + creditsHtml = css + $"{creditsHtml}"; gwbChangeLog.LoadHtml(changelogHtml.Replace("©", "©")); gwbCredits.LoadHtml(creditsHtml.Replace("©", "©"));