fix: 配置页面保存按钮圆角的设置

SlimeNull · May 15, 2023 · a94cdaa · a94cdaa
1 parent 79df349
commit a94cdaa
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/OpenGptChat/OpenGptChat.csproj b/OpenGptChat/OpenGptChat.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>1.1.6.3</Version>
+    <Version>1.1.6.4</Version>
     <ImplicitUsings>disable</ImplicitUsings>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <StartupObject>OpenGptChat.EntryPoint</StartupObject>

diff --git a/...s/PublishProfiles/win64-standalone.pubxml → ...t/Properties/PublishProfiles/win32.pubxml b/...s/PublishProfiles/win64-standalone.pubxml → ...t/Properties/PublishProfiles/win32.pubxml
@@ -6,12 +6,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>bin\Release\net6.0-windows\publish\win-x64\</PublishDir>
+    <PublishDir>bin\Release\net6.0-windows\publish\win-x86\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <_TargetId>Folder</_TargetId>
     <TargetFramework>net6.0-windows</TargetFramework>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
+    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
+    <SelfContained>false</SelfContained>
     <PublishSingleFile>true</PublishSingleFile>
     <PublishReadyToRun>false</PublishReadyToRun>
   </PropertyGroup>

diff --git a/OpenGptChat/Utilities/UiUtils.cs b/OpenGptChat/Utilities/UiUtils.cs
@@ -31,10 +31,24 @@ private static void CornerRadiusChanged(DependencyObject d, DependencyPropertyCh
             if (d is not FrameworkElement ele)
                 return;
 
-            if (GetBorderFromControl(ele) is not Border border)
-                return;
+            void ApplyBorder(FrameworkElement ele)
+            {
+                if (GetBorderFromControl(ele) is not Border border)
+                    return;
 
-            border.CornerRadius = (CornerRadius)e.NewValue;
+                border.CornerRadius = (CornerRadius)e.NewValue;
+            }
+
+            void LoadedOnce(object? sender, RoutedEventArgs _e)
+            {
+                ApplyBorder(ele);
+                ele.Loaded -= LoadedOnce;
+            }
+
+            if (ele.IsLoaded)
+                ApplyBorder(ele);
+            else
+                ele.Loaded += LoadedOnce;
         }
 
         private static Border? GetBorderFromControl(FrameworkElement control)
@@ -46,8 +60,14 @@ private static void CornerRadiusChanged(DependencyObject d, DependencyPropertyCh
             for (int i = 0; i < childrenCount; i++)
             {
                 DependencyObject child = VisualTreeHelper.GetChild(control, i);
+                if (child is not FrameworkElement childElement)
+                    continue;
+
                 if (child is Border borderChild)
                     return borderChild;
+
+                if (GetBorderFromControl(childElement) is Border childBorderChild)
+                    return childBorderChild;
             }
 
             return null;