- Code refactor

wmjordan · Jun 7, 2024 · 299e249 · 299e249
1 parent f77a037
commit 299e249
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/Codist/Codist.csproj b/Codist/Codist.csproj
@@ -87,6 +87,7 @@
     <Compile Include="AutoBuildVersion\BuildSetting.cs" />
     <Compile Include="AutoBuildVersion\VersionRewriteMode.cs" />
     <Compile Include="AutoBuildVersion\VersionSetting.cs" />
+    <Compile Include="Controls\ThemedRichTextBox.cs" />
     <Compile Include="Commands\CancelRepeatingActionCommand.cs" />
     <Compile Include="Helpers\VsImageHelper.cs" />
     <Compile Include="Semantics\ArgumentAssignment.cs" />

diff --git a/Codist/Commands/ScreenshotCommand.cs b/Codist/Commands/ScreenshotCommand.cs
@@ -1,5 +1,4 @@
 using System;
-using System.ComponentModel.Design;
 using Codist.Controls;
 using Microsoft.VisualStudio.Shell;
 using R = Codist.Properties.Resources;

diff --git a/Codist/Commands/WindowInformerCommand.cs b/Codist/Commands/WindowInformerCommand.cs
@@ -19,7 +19,7 @@
 namespace Codist.Commands
 {
 	/// <summary>A command which displays information about the active window pane.</summary>
-	internal static class WindowInformerCommand
+	static class WindowInformerCommand
 	{
 		const int SubSectionFontSize = 14;
 
@@ -45,18 +45,7 @@ static void Execute(object sender, EventArgs e) {
 
 		[SuppressMessage("Usage", Suppression.VSTHRD010, Justification = Suppression.CheckedInCaller)]
 		static void DisplayWindowInfo(Window window) {
-			var tb = new RichTextBox {
-				BorderThickness = WpfHelper.NoMargin,
-				Background = ThemeHelper.DocumentPageBrush,
-				Foreground = ThemeHelper.DocumentTextBrush,
-				FontFamily = ThemeHelper.CodeTextFont,
-				IsDocumentEnabled = true,
-				IsReadOnly = true,
-				IsReadOnlyCaretVisible = true,
-				AcceptsReturn = false
-			};
-			tb.ApplyTemplate();
-			tb.GetFirstVisualChild<ScrollViewer>().ReferenceStyle(VsResourceKeys.ScrollViewerStyleKey);
+			var tb = new ThemedRichTextBox(true);
 			var blocks = tb.Document.Blocks;
 			blocks.Clear();
 			Section s;

diff --git a/Codist/Controls/ThemedRichTextBox.cs b/Codist/Controls/ThemedRichTextBox.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using Microsoft.VisualStudio.Shell;
+
+namespace Codist.Controls
+{
+	public class ThemedRichTextBox : RichTextBox
+	{
+		public ThemedRichTextBox(bool readOnly) {
+			BorderThickness = WpfHelper.NoMargin;
+			Background = ThemeHelper.DocumentPageBrush;
+			Foreground = ThemeHelper.DocumentTextBrush;
+			FontFamily = ThemeHelper.CodeTextFont;
+			IsDocumentEnabled = true;
+			IsReadOnly = readOnly;
+			IsReadOnlyCaretVisible = true;
+			AcceptsReturn = !readOnly;
+			ApplyTemplate();
+			this.GetFirstVisualChild<ScrollViewer>().ReferenceStyle(VsResourceKeys.ScrollViewerStyleKey);
+		}
+	}
+}