Jelajahi Sumber

Some visual adjustments

Krzysztof Krysiński 7 bulan lalu
induk
melakukan
37e74c5c6c

+ 0 - 42
src/PixiEditor.UI.Common/Controls/TextBlock.axaml

@@ -1,42 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-        <Border Padding="20">
-            <StackPanel Orientation="Vertical">
-                <TextBlock Classes="h1" Text="h1"/>
-                <TextBlock Classes="h2" Text="h2"/>
-                <TextBlock Classes="h3" Text="h3"/>
-                <TextBlock Classes="h4" Text="h4"/>
-            </StackPanel>
-        </Border>
-    </Design.PreviewWith>
-
-    <Style Selector="TextBlock">
-        <Setter Property="FontSize" Value="16"/>
-    </Style>
-
-    <Style Selector="TextBlock.h1">
-        <Setter Property="FontSize" Value="40"/>
-        <Setter Property="FontWeight" Value="Bold"/>
-    </Style>
-
-    <Style Selector="TextBlock.h2">
-        <Setter Property="FontSize" Value="32"/>
-        <Setter Property="FontWeight" Value="Bold"/>
-    </Style>
-
-    <Style Selector="TextBlock.h3">
-        <Setter Property="FontSize" Value="24"/>
-        <Setter Property="FontWeight" Value="Bold"/>
-    </Style>
-
-    <Style Selector="TextBlock.h4">
-        <Setter Property="FontSize" Value="20"/>
-        <Setter Property="FontWeight" Value="Bold"/>
-    </Style>
-
-    <Style Selector="TextBlock.h5">
-        <Setter Property="FontSize" Value="16"/>
-        <Setter Property="FontWeight" Value="Bold"/>
-    </Style>
-</Styles>

+ 1 - 1
src/PixiEditor.UI.Common/Controls/Window.axaml

@@ -16,7 +16,7 @@
                         <platform:ExtendClientAreaChromeHints>NoChrome</platform:ExtendClientAreaChromeHints>
                     </OnPlatform.Default>
                     <OnPlatform.macOS>
-                        <platform:ExtendClientAreaChromeHints>SystemChrome</platform:ExtendClientAreaChromeHints>
+                        <platform:ExtendClientAreaChromeHints>Default,NoChrome,OSXThickTitleBar</platform:ExtendClientAreaChromeHints>
                     </OnPlatform.macOS>
                 </OnPlatform>
             </Setter.Value>

+ 4 - 0
src/PixiEditor.UI.Common/Styles/TextStyles.axaml

@@ -5,6 +5,10 @@
             <TextBlock Classes="h1"/>
         </Border>
     </Design.PreviewWith>
+    
+    <Style Selector="TextBlock">
+        <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
 
     <Style Selector="TextBlock.h1">
         <Setter Property="FontSize" Value="{DynamicResource Header1}"/>

+ 1 - 1
src/PixiEditor/Styles/PixiEditorPopupTemplate.axaml

@@ -19,7 +19,7 @@
                         <platform:ExtendClientAreaChromeHints>NoChrome</platform:ExtendClientAreaChromeHints>
                     </OnPlatform.Default>
                     <OnPlatform.macOS>
-                        <platform:ExtendClientAreaChromeHints>SystemChrome</platform:ExtendClientAreaChromeHints>
+                        <platform:ExtendClientAreaChromeHints>Default,NoChrome,OSXThickTitleBar</platform:ExtendClientAreaChromeHints>
                     </OnPlatform.macOS>
                 </OnPlatform>
             </Setter.Value>

+ 2 - 1
src/PixiEditor/Views/MainWindow.axaml.cs

@@ -4,6 +4,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Interactivity;
 using Avalonia.OpenGL;
+using Avalonia.Platform;
 using Avalonia.Rendering.Composition;
 using Avalonia.Threading;
 using Microsoft.Extensions.DependencyInjection;
@@ -72,7 +73,7 @@ internal partial class MainWindow : Window
 
         var analytics = services.GetService<AnalyticsPeriodicReporter>();
         analytics?.Start(analyticsSessionId);
-        
+
         InitializeComponent();
     }