Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

歌词面板添加关闭按钮，并移除多余代码 #10

Merged
merged 3 commits into from
May 17, 2024
Merged

歌词面板添加关闭按钮，并移除多余代码 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd4391c
歌词面板添加关闭按钮，并移除多余代码
KCKT0112 May 16, 2024
d5b3971
撤销修改没有还原的选项
KCKT0112 May 16, 2024
0d84352
修复报错和移除无用代码
KCKT0112 May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions TuneLab/GUI/Dialog.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
Height="204"
ExtendClientAreaChromeHints="NoChrome"
ExtendClientAreaTitleBarHeightHint="40"
ExtendClientAreaToDecorationsHint="True"
UseLayoutRounding="True">
ExtendClientAreaToDecorationsHint="True">
<Window.Styles>
<Style Selector="TitleBar">
<Setter Property="Background" Value="DarkGray"/>
Expand Down
3 changes: 3 additions & 0 deletions TuneLab/TuneLab.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,8 @@
<Compile Update="Views\MainWindow.axaml.cs">
<DependentUpon>MainWindow.axaml</DependentUpon>
</Compile>
<Compile Update="Views\LyricInput.axaml.cs">
<DependentUpon>LyricInput.axaml</DependentUpon>
</Compile>
</ItemGroup>
</Project>
58 changes: 28 additions & 30 deletions TuneLab/Views/LyricInput.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,46 +4,44 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="480" d:DesignHeight="284"
x:Class="TuneLab.Views.LyricInput"
Title="TuneLab"
Title="Input Lyric - TuneLab"
Width="480"
Height="284"
ExtendClientAreaChromeHints="NoChrome"
ExtendClientAreaTitleBarHeightHint="40"
ExtendClientAreaToDecorationsHint="True"
UseLayoutRounding="True">
<Window.Styles>
<Style Selector="TitleBar">
<Setter Property="Background" Value="DarkGray"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style Selector="Window">
<Setter Property="CornerRadius" Value="12"/>
</Style>
</Window.Styles>

<DockPanel Margin="0">
<Grid DockPanel.Dock="Top" IsHitTestVisible="False" x:Name="TitleBar" Height="40">
ExtendClientAreaToDecorationsHint="True">

<DockPanel>
<Grid DockPanel.Dock="Top" Height="40" x:Name="TitleBar">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>

<Label x:Name="TitleLabel" Content="Input Lyrics" FontWeight="Bold" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White" />

<StackPanel Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center" Orientation="Horizontal" IsHitTestVisible="False"/>
<StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal" IsHitTestVisible="False">
<Label Content="Input Lyrics" x:Name="TitleLabel" FontWeight="Bold" FontSize="14" VerticalAlignment="Center" BorderThickness="0" IsHitTestVisible="False"/>
</StackPanel>
<StackPanel Grid.Column="2" x:Name="WindowControl" HorizontalAlignment="Right" VerticalAlignment="Center" />
</Grid>

<Grid Margin="0">
<Grid.RowDefinitions>
<RowDefinition Height="184" />
<RowDefinition Height="28" />
</Grid.RowDefinitions>
<ContentControl>
<Grid Width="480" Height="244">
<Grid.RowDefinitions>
<RowDefinition Height="184" />
<RowDefinition Height="28" />
</Grid.RowDefinitions>

<StackPanel Grid.Row="0" Orientation="Vertical" Margin="24, 16, 24, 16" HorizontalAlignment="Center" VerticalAlignment="Center" x:Name="TextareaBox" />
<StackPanel Grid.Row="0" Orientation="Vertical" Margin="24, 16, 24, 16" HorizontalAlignment="Center" VerticalAlignment="Center" x:Name="TextareaBox" />

<Grid Grid.Row="1" x:Name="ActionsPanel" Margin="24, 16, 24, 16">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid Grid.Row="1" x:Name="ActionsPanel" Margin="24, 16, 24, 16">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
</Grid>
</Grid>
</Grid>
</ContentControl>
</DockPanel>
</Window>
25 changes: 15 additions & 10 deletions TuneLab/Views/LyricInput.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
using Avalonia.Controls;
using Avalonia.Controls.Chrome;
using System;
using TuneLab.Utils;
using TuneLab.GUI;
using TuneLab.GUI.Components;
using CheckBox = TuneLab.GUI.Components.CheckBox;
using Avalonia.Layout;
using Button = TuneLab.GUI.Components.Button;
using Avalonia.Media;
using TuneLab.Data;
using System.Collections.Generic;
using System.Linq;
using TuneLab.Data;
using TuneLab.GUI;
using TuneLab.GUI.Components;
using TuneLab.Utils;
using Button = TuneLab.GUI.Components.Button;
using CheckBox = TuneLab.GUI.Components.CheckBox;

namespace TuneLab.Views;

internal partial class LyricInput : Window
{
LyricInput()
public LyricInput()
{
InitializeComponent();
Focusable = true;
Expand All @@ -25,9 +23,16 @@ internal partial class LyricInput : Window
WindowStartupLocation = WindowStartupLocation.CenterScreen;
Topmost = true;

this.DataContext = this;
this.Background = Style.INTERFACE.ToBrush();
TitleBar.Background = Style.BACK.ToBrush();
TitleLabel.Foreground = Style.TEXT_LIGHT.ToBrush();

var closeButton = new Button() { Width = 48, Height = 40 }
.AddContent(new() { Item = new BorderItem() { CornerRadius = 0 }, ColorSet = new() { HoveredColor = Colors.White.Opacity(0.2), PressedColor = Colors.White.Opacity(0.2) } })
.AddContent(new() { Item = new IconItem() { Icon = Assets.WindowClose }, ColorSet = new() { Color = Style.TEXT_LIGHT.Opacity(0.7) } });
closeButton.Clicked += () => Close();

WindowControl.Children.Add(closeButton);

mLyricInputBox = new TextInput();
mLyricInputBox.AcceptsReturn = true;
Expand Down
10 changes: 0 additions & 10 deletions TuneLab/Views/MainWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,7 @@
ExtendClientAreaChromeHints="NoChrome"
ExtendClientAreaTitleBarHeightHint="40"
ExtendClientAreaToDecorationsHint="True"
UseLayoutRounding="True"
SizeChanged="Window_SizeChanged">
<Window.Styles>
<Style Selector="TitleBar">
<Setter Property="Background" Value="DarkGray"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style Selector="Window">
<Setter Property="CornerRadius" Value="20"/>
</Style>
</Window.Styles>

<DockPanel Margin="{Binding $parent[Window].OffScreenMargin}">
<!-- Custom title bar -->
Expand Down
1 change: 0 additions & 1 deletion TuneLab/Views/MainWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ private void AttachWindowStateHandler()
}
break;
case WindowState.Minimized:
Trace.WriteLine("窗口状态：最小化");
break;
}

Expand Down
Loading