Merge branch 'master' of https://github.com/LiuYunPlayer/TuneLab

LiuYunPlayer · May 18, 2024 · 3fd2f72 · 3fd2f72
2 parents 6479e07 + 2bf310c
commit 3fd2f72
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 19 deletions.
diff --git a/TuneLab/GUI/Dialog.axaml b/TuneLab/GUI/Dialog.axaml
@@ -21,25 +21,29 @@
 		</Window.Styles>
 
 		<DockPanel Margin="0">
-			<Grid DockPanel.Dock="Top" IsHitTestVisible="False" x:Name="TitleBar" Height="40">
+			<Grid DockPanel.Dock="Top" x:Name="TitleBar" Height="40">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="*" />
 				</Grid.ColumnDefinitions>
-
-				<Label x:Name="TitleLabel" Content="Message" FontWeight="Bold" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White" />
+
+				<StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal" IsHitTestVisible="False">
+					<Label x:Name="TitleLabel" Content="Message" FontWeight="Bold" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White" />
+				</StackPanel>
 			</Grid>
 
-			<Grid Margin="0">
-				<Grid.RowDefinitions>
-					<RowDefinition Height="108" />
-					<RowDefinition Height="56" />
-				</Grid.RowDefinitions>
+			<ContentControl x:Name="Content">
+				<Grid Margin="0">
+					<Grid.RowDefinitions>
+						<RowDefinition Height="108" />
+						<RowDefinition Height="56" />
+					</Grid.RowDefinitions>
 
-				<StackPanel Grid.Row="0" Orientation="Vertical" Margin="12,0" HorizontalAlignment="Center" VerticalAlignment="Center">
-					<TextBlock x:Name="MessageTextBlock" Text="This is a modal window." Foreground="White" TextWrapping="Wrap" TextAlignment="Center" FontSize="14" Padding="0" Margin="0" />
-				</StackPanel>
+					<StackPanel Grid.Row="0" Orientation="Vertical" Margin="12,0" HorizontalAlignment="Center" VerticalAlignment="Center">
+						<TextBlock x:Name="MessageTextBlock" Text="This is a modal window." Foreground="White" TextWrapping="Wrap" TextAlignment="Center" FontSize="14" Padding="0" Margin="0" />
+					</StackPanel>
 
-				<Grid Grid.Row="1" x:Name="ButtonsPanel" Margin="0, 0, 0, 16"/>
-			</Grid>
+					<Grid Grid.Row="1" x:Name="ButtonsPanel" Margin="0, 0, 0, 16"/>
+				</Grid>
+			</ContentControl>
 		</DockPanel>
 </Window>
diff --git a/TuneLab/GUI/Dialog.axaml.cs b/TuneLab/GUI/Dialog.axaml.cs
@@ -4,6 +4,7 @@
 using Avalonia.Media;
 using ReactiveUI;
 using System;
+using System.Reflection.Metadata;
 using System.Threading.Tasks;
 using TuneLab.GUI;
 using TuneLab.GUI.Components;
@@ -34,13 +35,12 @@ public Dialog()
         Topmost = true;
 
         this.DataContext = this;
-        this.Background = Style.INTERFACE.ToBrush();
+        this.Background = Style.BACK.ToBrush();
+        Content.Background = Style.INTERFACE.ToBrush();
 
         titleBar = this.FindControl<Grid>("TitleBar") ?? throw new InvalidOperationException("TitleBar not found");
         titleLabel = this.FindControl<Label>("TitleLabel") ?? throw new InvalidOperationException("TitleLabel not found");
         messageTextBlock = this.FindControl<TextBlock>("MessageTextBlock") ?? throw new InvalidOperationException("MessageTextBlock not found");
-
-        titleBar.Background = Style.BACK.ToBrush();
     }
 
     public void SetTitle(string title)

diff --git a/TuneLab/Views/LyricInput.axaml b/TuneLab/Views/LyricInput.axaml
@@ -26,7 +26,7 @@
 			<StackPanel Grid.Column="2" x:Name="WindowControl" HorizontalAlignment="Right" VerticalAlignment="Center" />
 		</Grid>
 
-		<ContentControl>
+		<ContentControl x:Name="Content">
 			<Grid Width="480" Height="244">
 				<Grid.RowDefinitions>
 					<RowDefinition Height="184" />

diff --git a/TuneLab/Views/LyricInput.axaml.cs b/TuneLab/Views/LyricInput.axaml.cs
@@ -23,8 +23,7 @@ public LyricInput()
         WindowStartupLocation = WindowStartupLocation.CenterScreen;
         Topmost = true;
 
-        this.Background = Style.INTERFACE.ToBrush();
-        TitleBar.Background = Style.BACK.ToBrush();
+        this.Background = Style.BACK.ToBrush();
         TitleLabel.Foreground = Style.TEXT_LIGHT.ToBrush();
 
         var closeButton = new Button() { Width = 48, Height = 40 }
@@ -34,6 +33,8 @@ public LyricInput()
 
         WindowControl.Children.Add(closeButton);
 
+        Content.Background = Style.INTERFACE.ToBrush();
+
         mLyricInputBox = new TextInput();
         mLyricInputBox.AcceptsReturn = true;
         mLyricInputBox.Width = 432;