adjust group style

pull/3234/head
2dust 2023-02-09 16:43:50 +08:00
parent 30d82947d6
commit 0494cc4ce7
5 changed files with 13 additions and 6 deletions

View File

@ -135,6 +135,12 @@
TargetType="{x:Type GroupBox}"> TargetType="{x:Type GroupBox}">
<Setter Property="FontSize" Value="{DynamicResource StdFontSize}" /> <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
</Style> </Style>
<Style
x:Key="MyChipListBoxItem"
BasedOn="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBoxItem}"
TargetType="{x:Type ListBoxItem}">
<Setter Property="Margin" Value="-4,0" />
</Style>
</ResourceDictionary> </ResourceDictionary>

View File

@ -70,7 +70,7 @@ namespace v2rayN.Resx {
} }
/// <summary> /// <summary>
/// 查找类似 All servers 的本地化字符串。 /// 查找类似 All 的本地化字符串。
/// </summary> /// </summary>
public static string AllGroupServers { public static string AllGroupServers {
get { get {

View File

@ -449,7 +449,7 @@
<value>Ungrouped</value> <value>Ungrouped</value>
</data> </data>
<data name="AllGroupServers" xml:space="preserve"> <data name="AllGroupServers" xml:space="preserve">
<value>All servers</value> <value>All</value>
</data> </data>
<data name="FillServerAddressCustom" xml:space="preserve"> <data name="FillServerAddressCustom" xml:space="preserve">
<value>Please browse to import server configuration</value> <value>Please browse to import server configuration</value>

View File

@ -449,7 +449,7 @@
<value>未分组服务器</value> <value>未分组服务器</value>
</data> </data>
<data name="AllGroupServers" xml:space="preserve"> <data name="AllGroupServers" xml:space="preserve">
<value>所有服务器</value> <value>所有</value>
</data> </data>
<data name="FillServerAddressCustom" xml:space="preserve"> <data name="FillServerAddressCustom" xml:space="preserve">
<value>请浏览导入服务器配置</value> <value>请浏览导入服务器配置</value>

View File

@ -342,6 +342,7 @@
<ListBox <ListBox
x:Name="lstGroup" x:Name="lstGroup"
FontSize="{DynamicResource StdFontSize}" FontSize="{DynamicResource StdFontSize}"
ItemContainerStyle="{StaticResource MyChipListBoxItem}"
Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}"> Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}">
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate>
@ -353,15 +354,15 @@
x:Name="btnAddSub" x:Name="btnAddSub"
Width="30" Width="30"
Height="30" Height="30"
Margin="8,0" Margin="4,0"
Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"> Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
<materialDesign:PackIcon Kind="Plus" /> <materialDesign:PackIcon Kind="Plus" />
</Button> </Button>
<Separator /> <Separator />
<TextBox <TextBox
x:Name="txtServerFilter" x:Name="txtServerFilter"
Width="200" Width="100"
Margin="8,0" Margin="4,0"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgServerTitle}" materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgServerTitle}"
materialDesign:TextFieldAssist.HasClearButton="True" materialDesign:TextFieldAssist.HasClearButton="True"
Style="{StaticResource DefTextBox}" /> Style="{StaticResource DefTextBox}" />