From 59b7daaef585ac8aa9616853f786bbb894452b02 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 14 Nov 2024 14:25:58 +0800
Subject: [PATCH] Improve UI

---
 .../Views/ProfilesView.axaml.cs               |  2 +-
 .../v2rayN.Desktop/Views/SubEditWindow.axaml  | 53 ++++++++++++-------
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
index 9983f8c7..a2bfa298 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
@@ -198,7 +198,7 @@ namespace v2rayN.Desktop.Views
         private void LstProfiles_DoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
         {
             var source = e.Source as Border;
-            if (source == null || source.Name != "CellBorder") return;
+            if (source?.Name == "HeaderBackground") return;
             if (_config.UiItem.DoubleClick2Activate)
             {
                 ViewModel?.SetDefaultServer();
diff --git a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
index bd7e01f0..f0b25fe7 100644
--- a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
@@ -95,6 +95,41 @@
                     Classes="Margin8"
                     TextWrapping="Wrap"
                     Watermark="{x:Static resx:ResUI.SubUrlTips}" />
+                <Button
+                    Grid.Row="2"
+                    Grid.Column="2"
+                    Width="30"
+                    Height="30"
+                    Margin="10,0"
+                    Theme="{DynamicResource BorderlessButton}">
+                    <Button.Content>
+                        <PathIcon
+                            Width="20"
+                            Height="20"
+                            Data="{StaticResource building_more}"
+                            Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                    </Button.Content>
+                    <Button.Flyout>
+                        <Flyout>
+                            <StackPanel>
+                                <TextBlock
+                                    VerticalAlignment="Center"
+                                    Classes="Margin8"
+                                    Text="{x:Static resx:ResUI.LvMoreUrl}" />
+                                <TextBox
+                                    x:Name="txtMoreUrl"
+                                    Width="400"
+                                    MinHeight="100"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Center"
+                                    Classes="TextArea Margin8"
+                                    MinLines="4"
+                                    TextWrapping="Wrap"
+                                    Watermark="{x:Static resx:ResUI.SubUrlTips}" />
+                            </StackPanel>
+                        </Flyout>
+                    </Button.Flyout>
+                </Button>
 
                 <TextBlock
                     Grid.Row="3"
@@ -245,24 +280,6 @@
                     Classes="Margin8"
                     TextWrapping="Wrap" />
 
-                <TextBlock
-                    Grid.Row="13"
-                    Grid.Column="0"
-                    Grid.ColumnSpan="2"
-                    VerticalAlignment="Center"
-                    Classes="Margin8"
-                    Text="{x:Static resx:ResUI.LvMoreUrl}" />
-                <TextBox
-                    x:Name="txtMoreUrl"
-                    Grid.Row="14"
-                    Grid.Column="1"
-                    MinHeight="100"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center"
-                    Classes="TextArea Margin8"
-                    MinLines="4"
-                    TextWrapping="Wrap"
-                    Watermark="{x:Static resx:ResUI.SubUrlTips}" />
             </Grid>
         </ScrollViewer>
     </DockPanel>