Revert "解除竖向锁定，调整UI"

This reverts commit aec6928.
Uotan-Dev · Jul 31, 2024 · 3298801 · 3298801
1 parent 32a2580
commit 3298801
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/UotanToolbox/App.axaml.cs b/UotanToolbox/App.axaml.cs
@@ -30,8 +30,7 @@ public override void OnFrameworkInitializationCompleted()
             var mainVm = _provider?.GetRequiredService<MainViewModel>();
 
             desktop.MainWindow = viewLocator?.Build(mainVm) as Window;
-            desktop.MainWindow.MinWidth = 1220;
-            desktop.MainWindow.MaxWidth = 1220;
+            desktop.MainWindow.Width = 1240;
             desktop.MainWindow.Height = 840;
         }
 

diff --git a/UotanToolbox/Features/Appmgr/AppmgrView.axaml b/UotanToolbox/Features/Appmgr/AppmgrView.axaml
@@ -20,7 +20,7 @@
 	<WrapPanel Margin="15"
                theme:WrapPanelExtensions.AnimatedScroll="True"
                Orientation="Horizontal">
-		<suki:GlassCard Height="205" Width="464.25" HorizontalAlignment="Left" Margin="10 15" VerticalAlignment="Top">
+		<suki:GlassCard Height="205" Width="464.25" HorizontalAlignment="Left" Margin="15" VerticalAlignment="Top">
 			<StackPanel Spacing="10">
 				<TextBlock HorizontalAlignment="Left"
 						   FontSize="15"
@@ -119,7 +119,7 @@
 			</StackPanel>
 		</suki:GlassCard>
 
-		<Grid Margin="20 15 13 15">
+		<Grid Margin="15">
 			<suki:GlassCard Width="464.25"
 							Height="205"
 							VerticalAlignment="Top">
@@ -163,7 +163,7 @@
 		</Grid>
 
 		<suki:GlassCard Classes="Card"
-						Margin="10 15"
+						Margin="15"
 						Width="960"
 						Height="510">
 			<suki:BusyArea BusyText="{x:Static assets:Resources.Appmgr_Fetching}"

diff --git a/UotanToolbox/Features/Modifypartition/ModifypartitionView.axaml b/UotanToolbox/Features/Modifypartition/ModifypartitionView.axaml
@@ -15,7 +15,7 @@
 			   Margin="15"
 			   theme:WrapPanelExtensions.AnimatedScroll="True"
 			   Orientation="Horizontal">
-		<suki:GlassCard Classes="Card" Margin="10 15" Width="662">
+		<suki:GlassCard Classes="Card" Margin="15">
 			<suki:BusyArea  Name="BusyPart"
 							BusyText="载入中...">
 				<DataGrid Name="PartList"
@@ -28,7 +28,7 @@
 			</suki:BusyArea>
 		</suki:GlassCard>
 		<StackPanel Orientation="Vertical">
-			<suki:GlassCard Classes="Card" Margin="20 15 15 15" Width="265" Height="180">
+			<suki:GlassCard Classes="Card" Margin="15" Width="265" Height="180">
 				<StackPanel Orientation="Vertical" Spacing="5">
 					<TextBlock HorizontalAlignment="Left"
 							   VerticalAlignment="Top"
@@ -64,7 +64,7 @@
 					</StackPanel>
 				</StackPanel>
 			</suki:GlassCard>
-			<suki:GlassCard Classes="Card" Margin="20 15 15 15" Width="265" Height="400">
+			<suki:GlassCard Classes="Card" Margin="15" Width="265" Height="400">
 				<StackPanel Orientation="Vertical" Spacing="20">
 					<TextBlock HorizontalAlignment="Left"
 							   VerticalAlignment="Top"
@@ -110,7 +110,7 @@
 				</StackPanel>
 			</suki:GlassCard>
 		</StackPanel>
-		<suki:GlassCard Classes="Card" Margin="10 15" Height="100" Width="662">
+		<suki:GlassCard Classes="Card" Margin="15" Height="100" Width="662.5">
 			<StackPanel Orientation="Horizontal" Spacing="0">
 				<StackPanel Orientation="Vertical" VerticalAlignment="Center" Spacing="10">
 					<StackPanel Orientation="Horizontal" Spacing="30">
@@ -145,7 +145,7 @@
 				</Button>
 			</StackPanel>
 		</suki:GlassCard>
-		<suki:GlassCard Classes="Card" Margin="20 15 15 15" Width="265" Height="100" VerticalAlignment="Center">
+		<suki:GlassCard Classes="Card" Margin="15" Width="265" Height="100" VerticalAlignment="Center">
 			<StackPanel Orientation="Vertical" Spacing="15" VerticalAlignment="Center">
 				<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="10">
 					<Button Width="200"

diff --git a/UotanToolbox/Features/Others/OthersView.axaml b/UotanToolbox/Features/Others/OthersView.axaml
@@ -16,7 +16,7 @@
 			   Orientation="Horizontal">
 		<suki:GlassCard Width="320"
 						Height="310"
-						Margin="10 10 15 10"
+						Margin="15, 10"
 						VerticalAlignment="Top">
 			<suki:BusyArea Name="BusyDisplay"
 						   BusyText="{x:Static assets:Resources.Others_Modifying}">
@@ -78,7 +78,7 @@
 		</suki:GlassCard>
 		<suki:GlassCard Width="320"
 						Height="310"
-						Margin="10 10 15 10"
+						Margin="10"
 						VerticalAlignment="Top">
 			<suki:BusyArea Name="BusyBattery"
 						   BusyText="{x:Static assets:Resources.Others_Modifying}">
@@ -190,15 +190,15 @@
 			</suki:BusyArea>
 		</suki:GlassCard>
 
-		<suki:GlassCard Width="960"
+		<suki:GlassCard Width="955"
 						Height="90"
-						Margin="10"
+						Margin="15,10"
 						VerticalAlignment="Top">
 			<StackPanel Orientation="Horizontal">
 				<TextBlock HorizontalAlignment="Left"
 						   VerticalAlignment="Top"
 						   FontWeight="DemiBold"
-						   Margin="15,15,0,0"
+						   Margin="0,15,0,0"
 						   Text="{x:Static assets:Resources.Others_IconHide}" />
 				<StackPanel Orientation="Vertical" VerticalAlignment="Center" Margin="30,0,0,0" Spacing="10">
 					<StackPanel Orientation="Horizontal" Spacing="0">
@@ -224,9 +224,9 @@
 			</StackPanel>
 		</suki:GlassCard>
 
-		<suki:GlassCard Width="960"
+		<suki:GlassCard Width="955"
 						Height="310"
-						Margin="10"
+						Margin="15,10"
 						VerticalAlignment="Top">
 			<Grid>
 				<StackPanel Orientation="Vertical" Spacing="10">
@@ -323,7 +323,7 @@
 											TickFrequency="0.01"
 											Value="{Binding WindowScale}" />
 									<TextBlock Width="70"
-											   Margin="21,0,0,0"
+											   Margin="16,0,0,0"
 											   VerticalAlignment="Center"
 											   FontSize="13"
 											   Text="{x:Static assets:Resources.Others_SetScale}" />
@@ -386,7 +386,7 @@
 											TickFrequency="0.01"
 											Value="{Binding TransitionScale}" />
 									<TextBlock Width="70"
-											   Margin="21,0,0,0"
+											   Margin="16,0,0,0"
 											   VerticalAlignment="Center"
 											   FontSize="13"
 											   Text="{x:Static assets:Resources.Others_SetScale}" />
@@ -449,7 +449,7 @@
 											TickFrequency="0.01"
 											Value="{Binding AnimationLast}" />
 									<TextBlock Width="70"
-											   Margin="21,0,0,0"
+											   Margin="16,0,0,0"
 											   VerticalAlignment="Center"
 											   FontSize="13"
 											   Text="{x:Static assets:Resources.Others_SetScale}" />

diff --git a/UotanToolbox/MainView.axaml b/UotanToolbox/MainView.axaml
@@ -16,6 +16,7 @@
 				 BackgroundShaderFile="{Binding CustomShaderFile}"
 				 BackgroundStyle="{Binding BackgroundStyle}"
 				 BackgroundTransitionsEnabled="{Binding TransitionsEnabled}"
+                 CanResize="False"
                  Icon="Assets/OIG.N5o-removebg-preview.png"
                  IsMenuVisible="False"
                  mc:Ignorable="d">