Compare commits

..

No commits in common. "e0f005bd96df6be1f7ddf469292e0560037ed114" and "0b1b68165541a6f42b3dcdb729950f9ead2b0109" have entirely different histories.

5 changed files with 2 additions and 21 deletions

View file

@ -1,7 +1,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<Version>7.9.1</Version> <Version>7.9.0</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>

View file

@ -20,7 +20,4 @@
<Style Selector="Grid.Margin8"> <Style Selector="Grid.Margin8">
<Setter Property="Margin" Value="8" /> <Setter Property="Margin" Value="8" />
</Style> </Style>
<Style Selector="DataGrid"> </Styles>
<Setter Property="RowHeight" Value="24" />
</Style>
</Styles>

View file

@ -119,17 +119,6 @@ namespace v2rayN.Desktop.ViewModels
Value = size, Value = size,
}); });
Application.Current?.Styles.Add(style); Application.Current?.Styles.Add(style);
ModifyFontSizeEx(size);
}
private void ModifyFontSizeEx(double size)
{
//DataGrid
var rowHeight = 20 + (size / 2);
var style = new Style(x => x.OfType<DataGrid>());
style.Add(new Setter(DataGrid.RowHeightProperty, rowHeight));
Application.Current?.Styles.Add(style);
} }
private void ModifyFontFamily() private void ModifyFontFamily()

View file

@ -787,7 +787,6 @@
Classes="Margin8" /> Classes="Margin8" />
<TextBlock <TextBlock
x:Name="labLinuxSudoPassword"
Grid.Row="7" Grid.Row="7"
Grid.Column="0" Grid.Column="0"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -801,7 +800,6 @@
HorizontalAlignment="Left" HorizontalAlignment="Left"
Classes="Margin8" /> Classes="Margin8" />
<TextBlock <TextBlock
x:Name="labLinuxSudoPasswordTip"
Grid.Row="7" Grid.Row="7"
Grid.Column="2" Grid.Column="2"
VerticalAlignment="Center" VerticalAlignment="Center"

View file

@ -174,9 +174,6 @@ namespace v2rayN.Desktop.Views
if (Utils.IsWindows()) if (Utils.IsWindows())
{ {
txbSettingsExceptionTip2.IsVisible = false; txbSettingsExceptionTip2.IsVisible = false;
txtLinuxSudoPassword.IsVisible = false;
labLinuxSudoPassword.IsVisible = false;
labLinuxSudoPasswordTip.IsVisible = false;
} }
else else
{ {