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

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

@ -10,76 +10,61 @@
d:DesignWidth="800" d:DesignWidth="800"
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 VerticalAlignment="Center">
Margin="8,0" <TextBlock x:Name="txtSpeedProxyDisplay" />
VerticalAlignment="Center" <Border Margin="2" />
DockPanel.Dock="Right"> <TextBlock x:Name="txtSpeedDirectDisplay" />
<TextBlock x:Name="txtSpeedProxyDisplay" /> </StackPanel>
<Border Margin="2" />
<TextBlock x:Name="txtSpeedDirectDisplay" />
</StackPanel>
<StackPanel <StackPanel
Width="240" Margin="8,0"
Margin="8,0" VerticalAlignment="Center">
VerticalAlignment="Center" <TextBlock x:Name="txtInboundDisplay" />
DockPanel.Dock="Left"> <Border Margin="2" />
<TextBlock x:Name="txtInboundDisplay" /> <TextBlock x:Name="txtInboundLanDisplay" />
<Border Margin="2" /> </StackPanel>
<TextBlock x:Name="txtInboundLanDisplay" />
</StackPanel>
<StackPanel <StackPanel
x:Name="spEnableTun" x:Name="spEnableTun"
Width="100" VerticalAlignment="Center"
Margin="8,0" Orientation="Horizontal">
VerticalAlignment="Center" <TextBlock
DockPanel.Dock="Left" VerticalAlignment="Center"
Orientation="Horizontal"> Text="{x:Static resx:ResUI.TbEnableTunAs}" />
<TextBlock <ToggleSwitch
Margin="8,0" x:Name="togEnableTun"
VerticalAlignment="Center" HorizontalAlignment="Center"
Text="{x:Static resx:ResUI.TbEnableTunAs}" /> Theme="{StaticResource SimpleToggleSwitch}" />
<ToggleSwitch </StackPanel>
x:Name="togEnableTun"
HorizontalAlignment="Center"
Classes="Margin8"
Theme="{StaticResource SimpleToggleSwitch}" />
</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" ToolTip.Tip="{x:Static resx:ResUI.menuSystemproxy}">
Width="160" <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyClear}" />
Margin="8,0" <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxySet}" />
ToolTip.Tip="{x:Static resx:ResUI.menuSystemproxy}"> <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyNothing}" />
<ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyClear}" /> </ComboBox>
<ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxySet}" />
<ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyNothing}" />
</ComboBox>
<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>