Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-01-15 02:23:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor button styles and set UI defaults

Browse source 
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.
This commit is contained in:
Space Time 2026-01-05 17:01:42 +08:00
parent bc36cf8a47
commit d077f42768
7 changed files with 65 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
v2rayN/ServiceLib/Models/ConfigItems.cs
View file

@ -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; }

26
v2rayN/v2rayN/App.xaml
View file

@ -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"

4
v2rayN/v2rayN/Views/ClashConnectionsView.xaml
View file

@ -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>

4
v2rayN/v2rayN/Views/ClashProxiesView.xaml
View file

@ -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>

4
v2rayN/v2rayN/Views/MsgView.xaml
View file

@ -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>

2
v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml
View file

@ -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>

62
v2rayN/v2rayN/Views/ProfilesView.xaml
View file

@ -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"