Browse Source

Fix style for desktop

pull/5701/head
2dust 2 months ago
parent
commit
b4f50258a7
  1. 18
      v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml
  2. 2
      v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
  3. 4
      v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
  4. 2
      v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml

18
v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml

@ -92,7 +92,6 @@
<DockPanel>
<ListBox
x:Name="lstProxyGroups"
Margin="0,0,5,0"
DockPanel.Dock="Left"
ItemsSource="{Binding ProxyGroups}">
<ItemsControl.ItemsPanel>
@ -108,16 +107,17 @@
Padding="0"
Theme="{StaticResource CardBorder}">
<DockPanel>
<Grid Grid.Column="0" Classes="Margin4">
<Grid Grid.Column="0" Classes="Margin8">
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
<RowDefinition Height="1*" />
<RowDefinition Height="8" />
<RowDefinition Height="1*" />
</Grid.RowDefinitions>
<DockPanel Grid.Row="0">
<TextBlock DockPanel.Dock="Right" Text="{Binding type}" />
<TextBlock Text="{Binding name}" />
</DockPanel>
<TextBlock Grid.Row="1" Text="{Binding now}" />
<TextBlock Grid.Row="2" Text="{Binding now}" />
</Grid>
</DockPanel>
</Border>
@ -141,6 +141,7 @@
<DataTemplate>
<Border
Width="160"
Margin="0"
Padding="0"
Theme="{StaticResource CardBorder}">
<DockPanel>
@ -152,16 +153,17 @@
CornerRadius="4"
DockPanel.Dock="Left"
IsVisible="{Binding isActive}" />
<Grid Classes="Margin4">
<Grid Classes="Margin8">
<Grid.RowDefinitions>
<RowDefinition Height="2*" />
<RowDefinition Height="1*" />
<RowDefinition Height="8" />
<RowDefinition Height="1*" />
</Grid.RowDefinitions>
<TextBlock
Grid.Row="0"
Text="{Binding name}"
TextWrapping="WrapWithOverflow" />
<DockPanel Grid.Row="1">
<DockPanel Grid.Row="2">
<TextBlock
DockPanel.Dock="Right"
Foreground="{Binding Path=delay, Converter={StaticResource DelayColorConverter}}"

2
v2rayN/v2rayN.Desktop/Views/MainWindow.axaml

@ -148,7 +148,7 @@
<ToggleSwitch
x:Name="togEnableTun"
HorizontalAlignment="Left"
Classes="Margin4"
Classes="Margin8"
Theme="{StaticResource SimpleToggleSwitch}" />
</StackPanel>

4
v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

@ -16,7 +16,7 @@
<DockPanel Classes="Margin8">
<StackPanel
HorizontalAlignment="Center"
Classes="Margin4"
Classes="Margin8"
DockPanel.Dock="Bottom"
Orientation="Horizontal">
<Button
@ -113,7 +113,7 @@
<ListBox
x:Name="clbdestOverride"
HorizontalAlignment="Left"
Classes="Margin4"
Classes="Margin8"
SelectionMode="Multiple"
Theme="{DynamicResource PureCardRadioGroupListBox}" />
</StackPanel>

2
v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml

@ -243,7 +243,7 @@
MinHeight="100"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
Classes="TextArea Margin4"
Classes="TextArea Margin8"
MinLines="4"
TextWrapping="Wrap"
Watermark="{x:Static resx:ResUI.SubUrlTips}" />

Loading…
Cancel
Save