From cd320f3de6e35a01dc9749a265e4e946f97887e5 Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Sat, 1 Mar 2025 22:15:22 +0800 Subject: [PATCH] Move to resource --- .../Plugin/JsonRPCPluginSettings.cs | 10 ++++++---- .../Resources/CustomControlTemplate.xaml | 3 +++ .../Views/ExplorerSettings.xaml | 16 ++++++++-------- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs index ab6798473..499371c4b 100644 --- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs +++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs @@ -29,6 +29,8 @@ namespace Flow.Launcher.Core.Plugin 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 @@ namespace Flow.Launcher.Core.Plugin { var textBox = new TextBox() { - MinWidth = 180, + MinWidth = SettingPanelTextBlockMinWidth, HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center, Margin = SettingPanelItemLeftTopBottomMargin, @@ -258,7 +260,7 @@ namespace Flow.Launcher.Core.Plugin { var textBox = new TextBox() { - MinWidth = 240, + MinWidth = SettingPanelPathTextBlockMinWidth, HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center, Margin = SettingPanelItemLeftMargin, @@ -324,7 +326,7 @@ namespace Flow.Launcher.Core.Plugin var textBox = new TextBox() { MaxHeight = 150, - MinWidth = 180, + MinWidth = SettingPanelTextBlockMinWidth, HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center, Margin = SettingPanelItemLeftTopBottomMargin, @@ -347,7 +349,7 @@ namespace Flow.Launcher.Core.Plugin { 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 index 9843c4595..e10539c8e 100644 --- a/Flow.Launcher/Resources/CustomControlTemplate.xaml +++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml @@ -5602,4 +5602,7 @@ + + 180 + 240 diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml index 85b155a39..836e2d558 100644 --- 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">