Skip to content

Commit 59b7daa

Browse files
committed
Improve UI
1 parent d781c76 commit 59b7daa

File tree

2 files changed

+36
-19
lines changed

2 files changed

+36
-19
lines changed

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ private void lstProfiles_SelectionChanged(object? sender, SelectionChangedEventA
198198
private void LstProfiles_DoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
199199
{
200200
var source = e.Source as Border;
201-
if (source == null || source.Name != "CellBorder") return;
201+
if (source?.Name == "HeaderBackground") return;
202202
if (_config.UiItem.DoubleClick2Activate)
203203
{
204204
ViewModel?.SetDefaultServer();

v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,41 @@
9595
Classes="Margin8"
9696
TextWrapping="Wrap"
9797
Watermark="{x:Static resx:ResUI.SubUrlTips}" />
98+
<Button
99+
Grid.Row="2"
100+
Grid.Column="2"
101+
Width="30"
102+
Height="30"
103+
Margin="10,0"
104+
Theme="{DynamicResource BorderlessButton}">
105+
<Button.Content>
106+
<PathIcon
107+
Width="20"
108+
Height="20"
109+
Data="{StaticResource building_more}"
110+
Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
111+
</Button.Content>
112+
<Button.Flyout>
113+
<Flyout>
114+
<StackPanel>
115+
<TextBlock
116+
VerticalAlignment="Center"
117+
Classes="Margin8"
118+
Text="{x:Static resx:ResUI.LvMoreUrl}" />
119+
<TextBox
120+
x:Name="txtMoreUrl"
121+
Width="400"
122+
MinHeight="100"
123+
HorizontalAlignment="Stretch"
124+
VerticalAlignment="Center"
125+
Classes="TextArea Margin8"
126+
MinLines="4"
127+
TextWrapping="Wrap"
128+
Watermark="{x:Static resx:ResUI.SubUrlTips}" />
129+
</StackPanel>
130+
</Flyout>
131+
</Button.Flyout>
132+
</Button>
98133

99134
<TextBlock
100135
Grid.Row="3"
@@ -245,24 +280,6 @@
245280
Classes="Margin8"
246281
TextWrapping="Wrap" />
247282

248-
<TextBlock
249-
Grid.Row="13"
250-
Grid.Column="0"
251-
Grid.ColumnSpan="2"
252-
VerticalAlignment="Center"
253-
Classes="Margin8"
254-
Text="{x:Static resx:ResUI.LvMoreUrl}" />
255-
<TextBox
256-
x:Name="txtMoreUrl"
257-
Grid.Row="14"
258-
Grid.Column="1"
259-
MinHeight="100"
260-
HorizontalAlignment="Stretch"
261-
VerticalAlignment="Center"
262-
Classes="TextArea Margin8"
263-
MinLines="4"
264-
TextWrapping="Wrap"
265-
Watermark="{x:Static resx:ResUI.SubUrlTips}" />
266283
</Grid>
267284
</ScrollViewer>
268285
</DockPanel>

0 commit comments

Comments
 (0)