From 4b849d9d5ccdab6d97ce0671cc4d29e63c45d3cf Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sun, 18 May 2025 20:33:55 +0800
Subject: [PATCH] ux: update workspace/page switcher popup layout

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/en_US.axaml    |  4 ++--
 src/Resources/Locales/ru_RU.axaml    |  2 +-
 src/Resources/Locales/zh_CN.axaml    |  4 ++--
 src/Resources/Locales/zh_TW.axaml    |  4 ++--
 src/Views/Launcher.axaml             |  4 ++--
 src/Views/LauncherPageSwitcher.axaml | 10 +++++-----
 src/Views/WorkspaceSwitcher.axaml    | 10 +++++-----
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 65b9d325..bb259272 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -430,8 +430,8 @@
   <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Open in Browser</x:String>
   <x:String x:Key="Text.Launcher.Error" xml:space="preserve">ERROR</x:String>
   <x:String x:Key="Text.Launcher.Info" xml:space="preserve">NOTICE</x:String>
-  <x:String x:Key="Text.Launcher.SwitchWorkspace" xml:space="preserve">Switch Workspace</x:String>
-  <x:String x:Key="Text.Launcher.SwitchTab" xml:space="preserve">Switch Tab</x:String>
+  <x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">Workspaces</x:String>
+  <x:String x:Key="Text.Launcher.Pages" xml:space="preserve">Pages</x:String>
   <x:String x:Key="Text.Merge" xml:space="preserve">Merge Branch</x:String>
   <x:String x:Key="Text.Merge.Into" xml:space="preserve">Into:</x:String>
   <x:String x:Key="Text.Merge.Mode" xml:space="preserve">Merge Option:</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index a569cd97..77a7ba4f 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -433,7 +433,7 @@
   <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Открыть в браузере</x:String>
   <x:String x:Key="Text.Launcher.Error" xml:space="preserve">ОШИБКА</x:String>
   <x:String x:Key="Text.Launcher.Info" xml:space="preserve">УВЕДОМЛЕНИЕ</x:String>
-  <x:String x:Key="Text.Launcher.SwitchWorkspace" xml:space="preserve">Переключить рабочее место</x:String>
+  <x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">Рабочие места</x:String>
   <x:String x:Key="Text.Merge" xml:space="preserve">Влить ветку</x:String>
   <x:String x:Key="Text.Merge.Into" xml:space="preserve">В:</x:String>
   <x:String x:Key="Text.Merge.Mode" xml:space="preserve">Опции слияния:</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 1344dfed..18569a14 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -434,8 +434,8 @@
   <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">在浏览器中访问</x:String>
   <x:String x:Key="Text.Launcher.Error" xml:space="preserve">出错了</x:String>
   <x:String x:Key="Text.Launcher.Info" xml:space="preserve">系统提示</x:String>
-  <x:String x:Key="Text.Launcher.SwitchWorkspace" xml:space="preserve">切换工作区</x:String>
-  <x:String x:Key="Text.Launcher.SwitchTab" xml:space="preserve">切换页面</x:String>
+  <x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">工作区列表</x:String>
+  <x:String x:Key="Text.Launcher.Pages" xml:space="preserve">页面列表</x:String>
   <x:String x:Key="Text.Merge" xml:space="preserve">合并分支</x:String>
   <x:String x:Key="Text.Merge.Into" xml:space="preserve">目标分支 ：</x:String>
   <x:String x:Key="Text.Merge.Mode" xml:space="preserve">合并方式 ：</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index a95f7211..ded99a14 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -434,8 +434,8 @@
   <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">在瀏覽器中開啟連結</x:String>
   <x:String x:Key="Text.Launcher.Error" xml:space="preserve">發生錯誤</x:String>
   <x:String x:Key="Text.Launcher.Info" xml:space="preserve">系統提示</x:String>
-  <x:String x:Key="Text.Launcher.SwitchWorkspace" xml:space="preserve">切換工作區</x:String>
-  <x:String x:Key="Text.Launcher.SwitchTab" xml:space="preserve">切換目前頁面</x:String>
+  <x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">工作區列表</x:String>
+  <x:String x:Key="Text.Launcher.Pages" xml:space="preserve">頁面列表</x:String>
   <x:String x:Key="Text.Merge" xml:space="preserve">合併分支</x:String>
   <x:String x:Key="Text.Merge.Into" xml:space="preserve">目標分支:</x:String>
   <x:String x:Key="Text.Merge.Mode" xml:space="preserve">合併方式:</x:String>
diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index c9565452..18e307fe 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -103,13 +103,13 @@
       </ContentControl.DataTemplates>
     </ContentControl>
     
-    <!-- Workspace Switcher -->
+    <!-- Workspace/Pages Switcher -->
     <Border Grid.Row="1"
             Background="Transparent"
             IsVisible="{Binding Switcher, Converter={x:Static ObjectConverters.IsNotNull}}">
       <Border HorizontalAlignment="Center" VerticalAlignment="Center" Effect="drop-shadow(0 0 12 #A0000000)">
         <Border Background="{DynamicResource Brush.Popup}" CornerRadius="8">
-          <ContentControl Margin="16" Content="{Binding Switcher}">
+          <ContentControl Margin="16,10,16,12" Content="{Binding Switcher}">
             <ContentControl.DataTemplates>
               <DataTemplate DataType="vm:WorkspaceSwitcher">
                 <v:WorkspaceSwitcher/>
diff --git a/src/Views/LauncherPageSwitcher.axaml b/src/Views/LauncherPageSwitcher.axaml
index 09f42038..4d785b55 100644
--- a/src/Views/LauncherPageSwitcher.axaml
+++ b/src/Views/LauncherPageSwitcher.axaml
@@ -8,15 +8,15 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.LauncherPageSwitcher"
              x:DataType="vm:LauncherPageSwitcher">
-  <Grid RowDefinitions="28,Auto,Auto">
+  <Grid RowDefinitions="Auto,Auto,Auto">
     <TextBlock Grid.Row="0"
-               Text="{DynamicResource Text.Launcher.SwitchTab}"
+               Text="{DynamicResource Text.Launcher.Pages}"
                FontWeight="Bold"
-               HorizontalAlignment="Center" VerticalAlignment="Top"/>
+               HorizontalAlignment="Center"/>
     
     <TextBox Grid.Row="1"
              Height="24"
-             Margin="4,0"
+             Margin="4,8,4,0"
              BorderThickness="1"
              CornerRadius="12"
              Text="{Binding SearchFilter, Mode=TwoWay}"
@@ -50,7 +50,7 @@
              x:Name="PagesListBox"
              Width="300"
              MaxHeight="400"
-             Margin="0,8,0,0"
+             Margin="4,8,4,0"
              BorderThickness="0"
              SelectionMode="Single"
              Background="Transparent"
diff --git a/src/Views/WorkspaceSwitcher.axaml b/src/Views/WorkspaceSwitcher.axaml
index aa621b73..4a324f3e 100644
--- a/src/Views/WorkspaceSwitcher.axaml
+++ b/src/Views/WorkspaceSwitcher.axaml
@@ -7,15 +7,15 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.WorkspaceSwitcher"
              x:DataType="vm:WorkspaceSwitcher">
-  <Grid RowDefinitions="28,Auto,Auto">
+  <Grid RowDefinitions="Auto,Auto,Auto">
     <TextBlock Grid.Row="0"
-               Text="{DynamicResource Text.Launcher.SwitchWorkspace}"
+               Text="{DynamicResource Text.Launcher.Workspaces}"
                FontWeight="Bold"
-               HorizontalAlignment="Center" VerticalAlignment="Top"/>
+               HorizontalAlignment="Center"/>
     
     <TextBox Grid.Row="1"
              Height="24"
-             Margin="4,0"
+             Margin="4,8,4,0"
              BorderThickness="1"
              CornerRadius="12"
              Text="{Binding SearchFilter, Mode=TwoWay}"
@@ -49,7 +49,7 @@
              x:Name="WorkspaceListBox"
              Width="300"
              MaxHeight="400"
-             Margin="0,8,0,0"
+             Margin="4,8,4,0"
              BorderThickness="0"
              SelectionMode="Single"
              Background="Transparent"