bozhihouc/clashN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust the margins and paddings

Browse Source
This commit is contained in:
SlimeNull
2023-02-17 11:47:49 +08:00
parent 988896bc30
commit 4409a891df
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
clashN/clashN/App.xaml
View File

@@ -11,7 +11,7 @@
<ResourceDictionary xmlns:system="clr-namespace:System;assembly=mscorlib"> <ResourceDictionary xmlns:system="clr-namespace:System;assembly=mscorlib">
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<materialDesign:BundledTheme <materialDesign:BundledTheme
BaseTheme="Light" BaseTheme="Dark"
PrimaryColor="Blue" PrimaryColor="Blue"
SecondaryColor="Lime" /> SecondaryColor="Lime" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" /> <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
@@ -65,8 +65,9 @@
<Style TargetType="{x:Type TextElement}"> <Style TargetType="{x:Type TextElement}">
<Setter Property="FontWeight" Value="Regular" /> <Setter Property="FontWeight" Value="Regular" />
</Style> </Style>
<Style x:Key="lvItemSelected" TargetType="{x:Type ListViewItem}"> <Style x:Key="lvItemSelected"
<Setter Property="Margin" Value="2" /> TargetType="{x:Type ListViewItem}">
<Setter Property="Margin" Value="5" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="ListViewItem"> <ControlTemplate TargetType="ListViewItem">
@@ -75,7 +76,7 @@
</materialDesign:Card> </materialDesign:Card>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsSelected" Value="true"> <Trigger Property="IsSelected" Value="true">
<Setter TargetName="_Card" Property="Foreground" Value="{DynamicResource PrimaryHueLightBrush}"/> <Setter TargetName="_Card" Property="Foreground" Value="{DynamicResource PrimaryHueDarkBrush}"/>
</Trigger> </Trigger>
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
@@ -96,6 +97,7 @@
BasedOn="{StaticResource MaterialDesignRaisedButton}" BasedOn="{StaticResource MaterialDesignRaisedButton}"
TargetType="{x:Type ButtonBase}"> TargetType="{x:Type ButtonBase}">
<Setter Property="FontSize" Value="{DynamicResource StdFontSize3}" /> <Setter Property="FontSize" Value="{DynamicResource StdFontSize3}" />
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkForegroundBrush}"/>
</Style> </Style>
<Style <Style
x:Key="DefMenu" x:Key="DefMenu"

2
clashN/clashN/Views/MainWindow.xaml
View File

@@ -32,7 +32,7 @@
Style="{StaticResource MaterialDesignEmbeddedDialogHost}"> Style="{StaticResource MaterialDesignEmbeddedDialogHost}">
<Grid> <Grid>
<Grid Grid.Column="0"> <Grid Grid.Column="0">
<TabControl Style="{StaticResource MaterialDesignNavigatilRailTabControl}"> <TabControl Style="{StaticResource MaterialDesignNavigatilRailTabControl}" Padding="10, 0">
<materialDesign:NavigationRailAssist.FloatingContent> <materialDesign:NavigationRailAssist.FloatingContent>
<StackPanel <StackPanel
Width="auto" Width="auto"

4
clashN/clashN/Views/ProxiesView.xaml
View File

@@ -96,11 +96,12 @@
</ToolBar> </ToolBar>
</ToolBarTray> </ToolBarTray>
<DockPanel> <DockPanel>
<ListView <ListView
x:Name="lstProxyGroups" x:Name="lstProxyGroups"
Margin="0, 0, 5, 0"
BorderThickness="0" BorderThickness="0"
DockPanel.Dock="Left" DockPanel.Dock="Left"
Style="{StaticResource MaterialDesignListView}"
ItemContainerStyle="{StaticResource lvItemSelected}" ItemContainerStyle="{StaticResource lvItemSelected}"
ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Visible"> ScrollViewer.VerticalScrollBarVisibility="Visible">
@@ -145,6 +146,7 @@
<ListView <ListView
x:Name="lstProxyDetails" x:Name="lstProxyDetails"
BorderThickness="0" BorderThickness="0"
Style="{StaticResource MaterialDesignListView}"
ItemContainerStyle="{StaticResource lvItemSelected}" ItemContainerStyle="{StaticResource lvItemSelected}"
ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Visible"> ScrollViewer.VerticalScrollBarVisibility="Visible">