Merge remote-tracking branch 'origin/master'

Author: meruune

Amethyst/App.axaml

@@ -142,10 +142,10 @@
     </Application.Resources>
 
     <Application.Styles>
-        <sty:FluentAvaloniaTheme PreferSystemTheme="True" PreferUserAccentColor="True" />
+        <sty:FluentAvaloniaTheme PreferSystemTheme="True" PreferUserAccentColor="{OnPlatform Windows='True', Default='False'}" />
 
         <Style Selector=":is(TopLevel)">
-            <Setter Property="FontFamily" Value="Segoe UI" />
+            <Setter Property="FontFamily" Value="avares://Amethyst/Assets/Fonts#Inter" />
         </Style>
 
         <Style Selector="controls|FontIcon">

Amethyst/App.axaml.cs

@@ -81,9 +81,9 @@ public override void OnFrameworkInitializationCompleted()
         base.OnFrameworkInitializationCompleted();
     }
 
-    private void SetupCoreApplication()
+    private async Task SetupCoreApplication()
     {
-        AsyncUtils.RunSync(PathsHandler.Setup);
+        await PathsHandler.Setup();
 
         // Listen for and log all uncaught second-chance exceptions : Domain
         AppDomain.CurrentDomain.UnhandledException += (_, e) =>
@@ -200,7 +200,7 @@ private async Task SetupApplication(IClassicDesktopStyleApplicationLifetime desk
     {
         if (desktop?.MainWindow == null) throw new ArgumentNullException(nameof(desktop));
 
-        SetupCoreApplication();
+        await SetupCoreApplication();
         var args = desktop.Args;
 
         if (args != null)

Amethyst/Assets/Fonts/Inter-Italic-VariableFont_opsz,wght.ttf

@@ -1099,4 +1099,30 @@ Redistribution and use in source and binary forms, with or without modification,
 
  * Neither the name Facebook nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+AVALONIA
+
+The MIT License (MIT)
+
+Copyright (c) AvaloniaUI OÜ All Rights Reserved
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+FLUENTAVALONIAUI
+
+MIT License
+
+Copyright (c) 2025 amwx
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Amethyst/Assets/Fonts/Inter-VariableFont_opsz,wght.ttf

@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -12,37 +12,48 @@
 
     <Grid x:Name="RootGrid" RowDefinitions="Auto,*">
         <Grid Name="TitleBarHost" ZIndex="1"
-              ColumnDefinitions="Auto,Auto,*,Auto"
-              Background="Transparent">
+              ColumnDefinitions="Auto,Auto,*,Auto,Auto"
+              Background="Transparent"
+              PointerPressed="TitleBarHost_OnPointerPressed">
             <Image Margin="16,4,12,4"
                    IsHitTestVisible="False"
                    Source="/Assets/ktvr.ico"
                    Width="18" Height="18"
                    DockPanel.Dock="Left"
                    Name="MainWindowIcon"
-                   RenderOptions.BitmapInterpolationMode="HighQuality">
-                <Image.IsVisible>
-                    <OnPlatform Default="False">
-                        <On Options="Windows" Content="True" />
-                    </OnPlatform>
-                </Image.IsVisible>
-            </Image>
+                   RenderOptions.BitmapInterpolationMode="HighQuality" />
 
             <TextBlock Text="{Binding Title, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
                        x:Name="AppTitleLabel" FontSize="12"
                        IsHitTestVisible="False"
                        VerticalAlignment="Center"
-                       Grid.Column="1">
-                <TextBlock.IsVisible>
-                    <OnPlatform Default="False">
-                        <On Options="Windows" Content="True" />
-                    </OnPlatform>
-                </TextBlock.IsVisible>
-            </TextBlock>
+                       Grid.Column="1" />
 
             <Border Grid.Column="2" Padding="6" Margin="0,-2,0,0">
                 <AutoCompleteBox ZIndex="1" Name="SearchBox" MaxHeight="40" MaxWidth="500" Watermark="Search" />
             </Border>
+            
+            <StackPanel Grid.Column="4" VerticalAlignment="Center" 
+                        Orientation="Horizontal" Spacing="4" Margin="0,0,4,0">
+                <Button Height="34" Width="34" BorderThickness="0" Background="Transparent"
+                        Click="MinimizeButton_OnClick">
+                    <Button.Content>
+                        <controls:FontIcon Glyph="&#xE921;" FontSize="13" />
+                    </Button.Content>
+                </Button>
+                <Button Height="34" Width="34" BorderThickness="0" Background="Transparent"
+                        Click="MaximizeButton_OnClick">
+                    <Button.Content>
+                        <controls:FontIcon Glyph="&#xE922;" FontSize="13" />
+                    </Button.Content>
+                </Button>
+                <Button Height="34" Width="34" BorderThickness="0" Background="Transparent"
+                        Click="CloseButton_OnClick">
+                    <Button.Content>
+                        <controls:FontIcon Glyph="&#xE8BB;" FontSize="13" />
+                    </Button.Content>
+                </Button>
+            </StackPanel>
         </Grid>
 
         <!-- ~1~ ReSharper disable once Xaml.MissingGridIndex @1@ -->
@@ -85,21 +96,6 @@
             <!--     </TextBlock> -->
             <!-- </Grid> -->
 
-            <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Background="Transparent">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="62" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="40" />
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
-
-                <Grid Background="Transparent" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
-                      Grid.Column="1" x:Name="DragElement" ZIndex="1" />
-            </Grid>
-
             <Grid VerticalAlignment="Top" HorizontalAlignment="Left"
                   Width="70" Height="300" Margin="0,40,0,0"
                   x:Name="NavigationBlockerGrid" Background="Transparent"