github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Fix style for desktop

pull/5701/head
2dust 2 months ago
parent
346a9c5fcc
commit
b4f50258a7
4 changed files with 14 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
Unescape View File

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

2
v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
Unescape View File

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

4
v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
Unescape View File

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

2
v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
Unescape View File

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

Write Preview
Loading…
Cancel
Save