From d077f4276845b8404cee99ea3d13c5b41cd27741 Mon Sep 17 00:00:00 2001
From: Space Time <Zeus6_6@163.com>
Date: Mon, 5 Jan 2026 17:01:42 +0800
Subject: [PATCH] Refactor button styles and set UI defaults

Introduced a new 'FlatActionMiniButton' style and replaced usages of 'MaterialDesignFloatingActionMiniLightButton' with it across multiple views for a consistent look. Updated the default values for ColorPrimaryName, CurrentTheme, and CurrentFontSize in UIItem. Also adjusted the order of controls in ProfilesView for improved layout.
---
 v2rayN/ServiceLib/Models/ConfigItems.cs       |  6 +-
 v2rayN/v2rayN/App.xaml                        | 26 +++++++-
 v2rayN/v2rayN/Views/ClashConnectionsView.xaml |  4 +-
 v2rayN/v2rayN/Views/ClashProxiesView.xaml     |  4 +-
 v2rayN/v2rayN/Views/MsgView.xaml              |  4 +-
 v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml |  2 +-
 v2rayN/v2rayN/Views/ProfilesView.xaml         | 62 +++++++++----------
 7 files changed, 65 insertions(+), 43 deletions(-)

diff --git a/v2rayN/ServiceLib/Models/ConfigItems.cs b/v2rayN/ServiceLib/Models/ConfigItems.cs
index eeb88deb..4ec2e639 100644
--- a/v2rayN/ServiceLib/Models/ConfigItems.cs
+++ b/v2rayN/ServiceLib/Models/ConfigItems.cs
@@ -91,11 +91,11 @@ public class UIItem
     public int MainGirdHeight1 { get; set; }
     public int MainGirdHeight2 { get; set; }
     public EGirdOrientation MainGirdOrientation { get; set; } = EGirdOrientation.Vertical;
-    public string? ColorPrimaryName { get; set; }
-    public string? CurrentTheme { get; set; }
+    public string? ColorPrimaryName { get; set; } = "blue";
+    public string? CurrentTheme { get; set; } = nameof(ETheme.FollowSystem);
     public string CurrentLanguage { get; set; }
     public string CurrentFontFamily { get; set; }
-    public int CurrentFontSize { get; set; }
+    public int CurrentFontSize { get; set; } = 12;
     public bool EnableDragDropSort { get; set; }
     public bool DoubleClick2Activate { get; set; }
     public bool AutoHideStartup { get; set; }
diff --git a/v2rayN/v2rayN/App.xaml b/v2rayN/v2rayN/App.xaml
index 01c206ea..8074fe00 100644
--- a/v2rayN/v2rayN/App.xaml
+++ b/v2rayN/v2rayN/App.xaml
@@ -115,11 +115,35 @@
                 TargetType="{x:Type CheckBox}">
                 <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
             </Style>
+            <Style
+                x:Key="FlatActionMiniButton"
+                BasedOn="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                TargetType="{x:Type ButtonBase}">
+                <Setter Property="materialDesign:ElevationAssist.Elevation" Value="Dp0" />
+                <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Background}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesign.Brush.Primary}" />
+                <Setter Property="BorderThickness" Value="1.5" />
+                <Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.Primary}" />
+                <Style.Triggers>
+                    <Trigger Property="IsMouseOver" Value="True">
+                        <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
+                        <Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.Primary.Dark}" />
+                    </Trigger>
+                    <Trigger Property="IsPressed" Value="True">
+                        <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary}" />
+                        <Setter Property="Foreground" Value="White" />
+                    </Trigger>
+                </Style.Triggers>
+            </Style>
             <Style
                 x:Key="DefButton"
-                BasedOn="{StaticResource MaterialDesignRaisedButton}"
+                BasedOn="{StaticResource MaterialDesignFlatButton}"
                 TargetType="{x:Type ButtonBase}">
                 <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
+                <Setter Property="materialDesign:ElevationAssist.Elevation" Value="Dp0" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesign.Brush.Primary}" />
+                <Setter Property="BorderThickness" Value="1" />
+                <Setter Property="Padding" Value="16,4" />
             </Style>
             <Style
                 x:Key="DefContextMenu"
diff --git a/v2rayN/v2rayN/Views/ClashConnectionsView.xaml b/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
index 0e6ba6a7..239f1e03 100644
--- a/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
+++ b/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
@@ -34,7 +34,7 @@
                 Width="24"
                 Height="24"
                 Margin="{StaticResource MarginLeftRight8}"
-                Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                Style="{StaticResource FlatActionMiniButton}"
                 ToolTip="{x:Static resx:ResUI.menuConnectionCloseAll}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Close" />
             </Button>
@@ -44,7 +44,7 @@
                 Width="24"
                 Height="24"
                 Margin="{StaticResource MarginLeftRight8}"
-                Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                Style="{StaticResource FlatActionMiniButton}"
                 ToolTip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="ArrowSplitVertical" />
             </Button>
diff --git a/v2rayN/v2rayN/Views/ClashProxiesView.xaml b/v2rayN/v2rayN/Views/ClashProxiesView.xaml
index df8e739e..9462de08 100644
--- a/v2rayN/v2rayN/Views/ClashProxiesView.xaml
+++ b/v2rayN/v2rayN/Views/ClashProxiesView.xaml
@@ -62,7 +62,7 @@
                 Width="24"
                 Height="24"
                 Margin="{StaticResource MarginLeftRight8}"
-                Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                Style="{StaticResource FlatActionMiniButton}"
                 ToolTip="{x:Static resx:ResUI.menuProxiesReload}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Reload" />
             </Button>
@@ -72,7 +72,7 @@
                 Width="24"
                 Height="24"
                 Margin="{StaticResource MarginLeftRight8}"
-                Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                Style="{StaticResource FlatActionMiniButton}"
                 ToolTip="{x:Static resx:ResUI.menuProxiesDelaytest}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="LightningBolt" />
             </Button>
diff --git a/v2rayN/v2rayN/Views/MsgView.xaml b/v2rayN/v2rayN/Views/MsgView.xaml
index a8d63bf6..58ff9667 100644
--- a/v2rayN/v2rayN/Views/MsgView.xaml
+++ b/v2rayN/v2rayN/Views/MsgView.xaml
@@ -35,7 +35,7 @@
                 Height="24"
                 Margin="{StaticResource MarginLeftRight8}"
                 AutomationProperties.Name="{x:Static resx:ResUI.menuMsgViewCopyAll}"
-                Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                Style="{StaticResource FlatActionMiniButton}"
                 ToolTip="{x:Static resx:ResUI.menuMsgViewCopyAll}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="ContentCopy" />
             </Button>
@@ -45,7 +45,7 @@
                 Height="24"
                 Margin="{StaticResource MarginLeftRight8}"
                 AutomationProperties.Name="{x:Static resx:ResUI.menuMsgViewClear}"
-                Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                Style="{StaticResource FlatActionMiniButton}"
                 ToolTip="{x:Static resx:ResUI.menuMsgViewClear}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Delete" />
             </Button>
diff --git a/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml b/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml
index 453d8c03..6ed2f05b 100644
--- a/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml
+++ b/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml
@@ -61,7 +61,7 @@
                         Height="30"
                         Margin="{StaticResource MarginLeftRight8}"
                         AutomationProperties.Name="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}"
-                        Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                        Style="{StaticResource FlatActionMiniButton}"
                         ToolTip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
                         <materialDesign:PackIcon VerticalAlignment="Center" Kind="ArrowSplitVertical" />
                     </Button>
diff --git a/v2rayN/v2rayN/Views/ProfilesView.xaml b/v2rayN/v2rayN/Views/ProfilesView.xaml
index 6cf0d159..83ed3b78 100644
--- a/v2rayN/v2rayN/Views/ProfilesView.xaml
+++ b/v2rayN/v2rayN/Views/ProfilesView.xaml
@@ -42,7 +42,7 @@
                     Height="30"
                     Margin="{StaticResource MarginLeftRight4}"
                     AutomationProperties.Name="{x:Static resx:ResUI.menuSubEdit}"
-                    Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                    Style="{StaticResource FlatActionMiniButton}"
                     ToolTip="{x:Static resx:ResUI.menuSubEdit}">
                     <materialDesign:PackIcon VerticalAlignment="Center" Kind="Edit" />
                 </Button>
@@ -52,10 +52,38 @@
                     Height="30"
                     Margin="{StaticResource MarginLeftRight4}"
                     AutomationProperties.Name="{x:Static resx:ResUI.menuSubAdd}"
-                    Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
+                    Style="{StaticResource FlatActionMiniButton}"
                     ToolTip="{x:Static resx:ResUI.menuSubAdd}">
                     <materialDesign:PackIcon VerticalAlignment="Center" Kind="Plus" />
                 </Button>
+                <Button
+                    x:Name="btnAutofitColumnWidth"
+                    Width="30"
+                    Height="30"
+                    Margin="{StaticResource MarginLeftRight4}"
+                    AutomationProperties.Name="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}"
+                    Style="{StaticResource FlatActionMiniButton}"
+                    ToolTip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
+                    <materialDesign:PackIcon VerticalAlignment="Center" Kind="ArrowSplitVertical" />
+                </Button>
+                <Button
+                    x:Name="btnFastRealPing"
+                    Width="30"
+                    Height="30"
+                    Margin="{StaticResource MarginLeftRight4}"
+                    Style="{StaticResource FlatActionMiniButton}"
+                    ToolTip="{x:Static resx:ResUI.menuFastRealPing}">
+                    <materialDesign:PackIcon VerticalAlignment="Center" Kind="LightningBolt" />
+                </Button>
+                <Button
+                    x:Name="menuMixedTestServer"
+                    Width="30"
+                    Height="30"
+                    Margin="{StaticResource MarginLeftRight4}"
+                    Style="{StaticResource FlatActionMiniButton}"
+                    ToolTip="{x:Static resx:ResUI.menuMixedTestServer}">
+                    <materialDesign:PackIcon VerticalAlignment="Center" Kind="Speedometer" />
+                </Button>
 
                 <TextBox
                     x:Name="txtServerFilter"
@@ -66,36 +94,6 @@
                     materialDesign:TextFieldAssist.HasClearButton="True"
                     AutomationProperties.Name="{x:Static resx:ResUI.MsgServerTitle}"
                     Style="{StaticResource DefTextBox}" />
-
-                <Button
-                    x:Name="btnAutofitColumnWidth"
-                    Width="30"
-                    Height="30"
-                    Margin="{StaticResource MarginLeftRight4}"
-                    AutomationProperties.Name="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}"
-                    Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
-                    ToolTip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
-                    <materialDesign:PackIcon VerticalAlignment="Center" Kind="ArrowSplitVertical" />
-                </Button>
-
-                <Button
-                    x:Name="btnFastRealPing"
-                    Width="30"
-                    Height="30"
-                    Margin="{StaticResource MarginLeftRight4}"
-                    Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
-                    ToolTip="{x:Static resx:ResUI.menuFastRealPing}">
-                    <materialDesign:PackIcon VerticalAlignment="Center" Kind="LightningBolt" />
-                </Button>
-                <Button
-                    x:Name="menuMixedTestServer"
-                    Width="30"
-                    Height="30"
-                    Margin="{StaticResource MarginLeftRight4}"
-                    Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
-                    ToolTip="{x:Static resx:ResUI.menuMixedTestServer}">
-                    <materialDesign:PackIcon VerticalAlignment="Center" Kind="Speedometer" />
-                </Button>
             </WrapPanel>
             <DataGrid
                 x:Name="lstProfiles"