Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-08-24 03:46:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

修复：状态栏文字过大时无法正常显示的问题

Browse source
This commit is contained in:
fonaix 2024-11-21 22:41:15 +08:00
parent 7810e90ebb
commit 8d335a7491
1 changed files with 53 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml
View file

@ -11,22 +11,17 @@
x:DataType="vms:StatusBarViewModel" x:DataType="vms:StatusBarViewModel"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid> <Grid>
<StackPanel Height="50"> <StackPanel Margin="0,5" Orientation="Horizontal">
<DockPanel>
<StackPanel <StackPanel
Margin="8,0" VerticalAlignment="Center">
VerticalAlignment="Center"
DockPanel.Dock="Right">
<TextBlock x:Name="txtSpeedProxyDisplay" /> <TextBlock x:Name="txtSpeedProxyDisplay" />
<Border Margin="2" /> <Border Margin="2" />
<TextBlock x:Name="txtSpeedDirectDisplay" /> <TextBlock x:Name="txtSpeedDirectDisplay" />
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Width="240"
Margin="8,0" Margin="8,0"
VerticalAlignment="Center" VerticalAlignment="Center">
DockPanel.Dock="Left">
<TextBlock x:Name="txtInboundDisplay" /> <TextBlock x:Name="txtInboundDisplay" />
<Border Margin="2" /> <Border Margin="2" />
<TextBlock x:Name="txtInboundLanDisplay" /> <TextBlock x:Name="txtInboundLanDisplay" />
@ -34,31 +29,23 @@
<StackPanel <StackPanel
x:Name="spEnableTun" x:Name="spEnableTun"
Width="100"
Margin="8,0"
VerticalAlignment="Center" VerticalAlignment="Center"
DockPanel.Dock="Left"
Orientation="Horizontal"> Orientation="Horizontal">
<TextBlock <TextBlock
Margin="8,0"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resx:ResUI.TbEnableTunAs}" /> Text="{x:Static resx:ResUI.TbEnableTunAs}" />
<ToggleSwitch <ToggleSwitch
x:Name="togEnableTun" x:Name="togEnableTun"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Classes="Margin8"
Theme="{StaticResource SimpleToggleSwitch}" /> Theme="{StaticResource SimpleToggleSwitch}" />
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Margin="8,0" Margin="8,0"
VerticalAlignment="Center" VerticalAlignment="Center"
DockPanel.Dock="Left"
Orientation="Horizontal"> Orientation="Horizontal">
<ComboBox <ComboBox
x:Name="cmbSystemProxy" x:Name="cmbSystemProxy"
Width="160"
Margin="8,0"
ToolTip.Tip="{x:Static resx:ResUI.menuSystemproxy}"> ToolTip.Tip="{x:Static resx:ResUI.menuSystemproxy}">
<ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyClear}" /> <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyClear}" />
<ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxySet}" /> <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxySet}" />
@ -67,19 +54,17 @@
<ComboBox <ComboBox
x:Name="cmbRoutings2" x:Name="cmbRoutings2"
Width="160" Margin="8,0,0,0"
Margin="8,0"
DisplayMemberBinding="{Binding Remarks}" DisplayMemberBinding="{Binding Remarks}"
ItemsSource="{Binding RoutingItems}" ItemsSource="{Binding RoutingItems}"
ToolTip.Tip="{x:Static resx:ResUI.menuRouting}" /> ToolTip.Tip="{x:Static resx:ResUI.menuRouting}" />
</StackPanel> </StackPanel>
<StackPanel Margin="8,0" VerticalAlignment="Center"> <StackPanel VerticalAlignment="Center">
<TextBlock x:Name="txtRunningServerDisplay" /> <TextBlock x:Name="txtRunningServerDisplay" />
<Border Margin="2" /> <Border Margin="2" />
<TextBlock x:Name="txtRunningInfoDisplay" /> <TextBlock x:Name="txtRunningInfoDisplay" />
</StackPanel> </StackPanel>
</DockPanel>
</StackPanel> </StackPanel>
</Grid> </Grid>
</UserControl> </UserControl>