Move to resource

Jack251970 · Jack251970 · commit cd320f3de6e3 · 2025-03-01T22:15:22.000+08:00
diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -29,6 +29,8 @@ public class JsonRPCPluginSettings
         private static readonly Thickness SettingPanelItemLeftMargin = (Thickness)Application.Current.FindResource("SettingPanelItemLeftMargin");
         private static readonly Thickness SettingPanelItemTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemTopBottomMargin");
         private static readonly Thickness SettingPanelItemLeftTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemLeftTopBottomMargin");
+        private static readonly double SettingPanelTextBlockMinWidth = (double)Application.Current.FindResource("SettingPanelTextBlockMinWidth");
+        private static readonly double SettingPanelPathTextBlockMinWidth = (double)Application.Current.FindResource("SettingPanelPathTextBlockMinWidth");
 
         public async Task InitializeAsync()
         {
@@ -236,7 +238,7 @@ public void Save()
                         {
                             var textBox = new TextBox()
                             {
-                                MinWidth = 180,
+                                MinWidth = SettingPanelTextBlockMinWidth,
                                 HorizontalAlignment = HorizontalAlignment.Left,
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftTopBottomMargin,
@@ -258,7 +260,7 @@ public void Save()
                         {
                             var textBox = new TextBox()
                             {
-                                MinWidth = 240,
+                                MinWidth = SettingPanelPathTextBlockMinWidth,
                                 HorizontalAlignment = HorizontalAlignment.Left,
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftMargin,
@@ -324,7 +326,7 @@ public void Save()
                             var textBox = new TextBox()
                             {
                                 MaxHeight = 150,
-                                MinWidth = 180,
+                                MinWidth = SettingPanelTextBlockMinWidth,
                                 HorizontalAlignment = HorizontalAlignment.Left,
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftTopBottomMargin,
@@ -347,7 +349,7 @@ public void Save()
                         {
                             var passwordBox = new PasswordBox()
                             {
-                                MinWidth = 180,
+                                MinWidth = SettingPanelTextBlockMinWidth,
                                 HorizontalAlignment = HorizontalAlignment.Left,
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftTopBottomMargin,
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5602,4 +5602,7 @@
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="Background" Value="{DynamicResource Color03B}" />
     </Style>
+
+    <system:Double x:Key="SettingPanelTextBlockMinWidth">180</system:Double>
+    <system:Double x:Key="SettingPanelPathTextBlockMinWidth">240</system:Double>
 </ResourceDictionary>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -174,7 +174,7 @@
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             Orientation="Horizontal">
             <TextBox
-                MinWidth="180"
+                MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Text="{Binding FileEditorPath}"
@@ -201,7 +201,7 @@
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             Orientation="Horizontal">
             <TextBox
-                MinWidth="180"
+                MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Text="{Binding FolderEditorPath}"
@@ -228,7 +228,7 @@
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             Orientation="Horizontal">
             <TextBox
-                MinWidth="180"
+                MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Text="{Binding ShellPath}"
@@ -299,7 +299,7 @@
         <TextBox
             Grid.Row="9"
             Grid.Column="1"
-            MinWidth="180"
+            MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             HorizontalAlignment="Left"
             Text="{Binding ExcludedFileTypes}"
@@ -314,7 +314,7 @@
         <TextBox
             Grid.Row="10"
             Grid.Column="1"
-            MinWidth="180"
+            MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
             Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
             HorizontalAlignment="Left"
             VerticalAlignment="Center"
@@ -361,7 +361,7 @@
             Grid.Row="15"
             Grid.Column="0"
             Grid.ColumnSpan="2"
-            MinWidth="180"
+            MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
             MaxHeight="150"
             Margin="{StaticResource SettingPanelItemTopBottomMargin}"
             HorizontalAlignment="Left"
@@ -381,7 +381,7 @@
             Grid.Row="17"
             Grid.Column="0"
             Grid.ColumnSpan="2"
-            MinWidth="180"
+            MinWidth="{StaticResource SettingPanelTextBlockMinWidth}"
             MaxHeight="150"
             Margin="{StaticResource SettingPanelItemTopBottomMargin}"
             HorizontalAlignment="Left"
@@ -529,7 +529,7 @@
         <TextBox
             Grid.Row="26"
             Grid.Column="1"
-            MinWidth="240"
+            MinWidth="{StaticResource SettingPanelPathTextBlockMinWidth}"
             Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
             HorizontalAlignment="Left"
             Text="{Binding EverythingInstalledPath}" />

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ public class JsonRPCPluginSettings`
`29`	`29`	`private static readonly Thickness SettingPanelItemLeftMargin = (Thickness)Application.Current.FindResource("SettingPanelItemLeftMargin");`
`30`	`30`	`private static readonly Thickness SettingPanelItemTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemTopBottomMargin");`
`31`	`31`	`private static readonly Thickness SettingPanelItemLeftTopBottomMargin = (Thickness)Application.Current.FindResource("SettingPanelItemLeftTopBottomMargin");`
	`32`	`+ private static readonly double SettingPanelTextBlockMinWidth = (double)Application.Current.FindResource("SettingPanelTextBlockMinWidth");`
	`33`	`+ private static readonly double SettingPanelPathTextBlockMinWidth = (double)Application.Current.FindResource("SettingPanelPathTextBlockMinWidth");`
`32`	`34`
`33`	`35`	`public async Task InitializeAsync()`
`34`	`36`	`{`
`@@ -236,7 +238,7 @@ public void Save()`
`236`	`238`	`{`
`237`	`239`	`var textBox = new TextBox()`
`238`	`240`	`{`
`239`		`- MinWidth = 180,`
	`241`	`+ MinWidth = SettingPanelTextBlockMinWidth,`
`240`	`242`	`HorizontalAlignment = HorizontalAlignment.Left,`
`241`	`243`	`VerticalAlignment = VerticalAlignment.Center,`
`242`	`244`	`Margin = SettingPanelItemLeftTopBottomMargin,`
`@@ -258,7 +260,7 @@ public void Save()`
`258`	`260`	`{`
`259`	`261`	`var textBox = new TextBox()`
`260`	`262`	`{`
`261`		`- MinWidth = 240,`
	`263`	`+ MinWidth = SettingPanelPathTextBlockMinWidth,`
`262`	`264`	`HorizontalAlignment = HorizontalAlignment.Left,`
`263`	`265`	`VerticalAlignment = VerticalAlignment.Center,`
`264`	`266`	`Margin = SettingPanelItemLeftMargin,`
`@@ -324,7 +326,7 @@ public void Save()`
`324`	`326`	`var textBox = new TextBox()`
`325`	`327`	`{`
`326`	`328`	`MaxHeight = 150,`
`327`		`- MinWidth = 180,`
	`329`	`+ MinWidth = SettingPanelTextBlockMinWidth,`
`328`	`330`	`HorizontalAlignment = HorizontalAlignment.Left,`
`329`	`331`	`VerticalAlignment = VerticalAlignment.Center,`
`330`	`332`	`Margin = SettingPanelItemLeftTopBottomMargin,`
`@@ -347,7 +349,7 @@ public void Save()`
`347`	`349`	`{`
`348`	`350`	`var passwordBox = new PasswordBox()`
`349`	`351`	`{`
`350`		`- MinWidth = 180,`
	`352`	`+ MinWidth = SettingPanelTextBlockMinWidth,`
`351`	`353`	`HorizontalAlignment = HorizontalAlignment.Left,`
`352`	`354`	`VerticalAlignment = VerticalAlignment.Center,`
`353`	`355`	`Margin = SettingPanelItemLeftTopBottomMargin,`