Removed rounded corners for Windows

src/PicView.Avalonia.Win32/Program.cs

@@ -28,10 +28,6 @@ internal class Program
                 UseOpacitySaveLayer = true
             })
             .UseWin32()
-            .With(new Win32PlatformOptions
-            {
-                WinUICompositionBackdropCornerRadius = 8
-            })
             .UseSkia();
     }
 }

src/PicView.Avalonia.Win32/Views/AboutWindow.axaml

@@ -4,23 +4,17 @@
     CornerRadius="8"
     SizeToContent="WidthAndHeight"
     Title="Loading..."
-    mc:Ignorable="d"
     x:Class="PicView.Avalonia.Win32.Views.AboutWindow"
     x:DataType="viewModels:MainViewModel"
     xmlns="https://github.com/avaloniaui"
     xmlns:customControls="clr-namespace:PicView.Avalonia.CustomControls;assembly=PicView.Avalonia"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels;assembly=PicView.Avalonia"
     xmlns:views="clr-namespace:PicView.Avalonia.Views;assembly=PicView.Avalonia"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.DataContext>
-        <viewModels:MainViewModel />
-    </Design.DataContext>
+
     <Border
         BorderBrush="{DynamicResource WindowBorderColor}"
         BorderThickness="1"
-        CornerRadius="8"
         PointerPressed="MoveWindow"
         x:Name="ParentBorder">
         <StackPanel>
@@ -31,7 +25,6 @@
                     Background="{DynamicResource WindowButtonBackgroundColor}"
                     BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="0,0,1,0"
-                    CornerRadius="8,0,0,0"
                     DockPanel.Dock="Left"
                     x:Name="IconBorder">
                     <Image
@@ -47,7 +40,6 @@
                     Classes="hover"
                     Click="Close"
                     ClickMode="Release"
-                    CornerRadius="0,8,0,0"
                     Data="{StaticResource CloseGeometry}"
                     DockPanel.Dock="Right"
                     Foreground="{DynamicResource MainTextColor}"

src/PicView.Avalonia.Win32/Views/BatchResizeResizeWindow.axaml

@@ -4,25 +4,17 @@
     CornerRadius="8"
     SizeToContent="WidthAndHeight"
     Title="Loading..."
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d"
     x:Class="PicView.Avalonia.Win32.Views.BatchResizeWindow"
     x:DataType="viewModels:MainViewModel"
     xmlns="https://github.com/avaloniaui"
     xmlns:customControls="clr-namespace:PicView.Avalonia.CustomControls;assembly=PicView.Avalonia"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels;assembly=PicView.Avalonia"
     xmlns:views="clr-namespace:PicView.Avalonia.Views;assembly=PicView.Avalonia"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.DataContext>
-        <viewModels:MainViewModel />
-    </Design.DataContext>
+
     <Border
         BorderBrush="{DynamicResource WindowBorderColor}"
         BorderThickness="1"
-        CornerRadius="8"
         PointerPressed="MoveWindow"
         x:Name="ParentBorder">
         <StackPanel>
@@ -33,7 +25,6 @@
                     Background="{DynamicResource WindowButtonBackgroundColor}"
                     BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="0,0,1,0"
-                    CornerRadius="8,0,0,0"
                     DockPanel.Dock="Left"
                     x:Name="IconBorder">
                     <Image
@@ -49,7 +40,6 @@
                     Classes="hover"
                     Click="Close"
                     ClickMode="Release"
-                    CornerRadius="0,8,0,0"
                     Data="{StaticResource CloseGeometry}"
                     DockPanel.Dock="Right"
                     Foreground="{DynamicResource MainTextColor}"

src/PicView.Avalonia.Win32/Views/ExifWindow.axaml

@@ -8,24 +8,18 @@
     Title="Loading..."
     Width="901"
     WindowStartupLocation="CenterOwner"
-    mc:Ignorable="d"
     x:Class="PicView.Avalonia.Win32.Views.ExifWindow"
     x:DataType="viewModels:MainViewModel"
     xmlns="https://github.com/avaloniaui"
     xmlns:buttons="clr-namespace:PicView.Avalonia.Views.UC.Buttons;assembly=PicView.Avalonia"
     xmlns:customControls="clr-namespace:PicView.Avalonia.CustomControls;assembly=PicView.Avalonia"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels;assembly=PicView.Avalonia"
     xmlns:views="clr-namespace:PicView.Avalonia.Views;assembly=PicView.Avalonia"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.DataContext>
-        <viewModels:MainViewModel />
-    </Design.DataContext>
+
     <Border
         BorderBrush="{DynamicResource WindowBorderColor}"
         BorderThickness="1"
-        CornerRadius="0,0,8,8"
         PointerPressed="MoveWindow"
         x:Name="ParentBorder">
         <DockPanel Background="Transparent">
@@ -150,8 +144,6 @@
 
                 <customControls:IconButton
                     Background="{DynamicResource MainButtonBackgroundColor}"
-                    BorderBrush="{DynamicResource MainBorderColor}"
-                    BorderThickness="0,0,1,0"
                     Classes="hover"
                     Click="Close"
                     ClickMode="Release"

src/PicView.Avalonia.Win32/Views/KeybindingsWindow.axaml

@@ -1,25 +1,17 @@
 <Window
     SizeToContent="Width"
     Title="KeybindingsWindow"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d"
     x:Class="PicView.Avalonia.Win32.Views.KeybindingsWindow"
     x:DataType="viewModels:MainViewModel"
     xmlns="https://github.com/avaloniaui"
     xmlns:customControls="clr-namespace:PicView.Avalonia.CustomControls;assembly=PicView.Avalonia"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels;assembly=PicView.Avalonia"
     xmlns:views="clr-namespace:PicView.Avalonia.Views;assembly=PicView.Avalonia"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.DataContext>
-        <viewModels:MainViewModel />
-    </Design.DataContext>
+
     <Border
         BorderBrush="{DynamicResource WindowBorderColor}"
         BorderThickness="1"
-        CornerRadius="8"
         PointerPressed="MoveWindow"
         x:Name="ParentBorder">
         <Panel>
@@ -32,8 +24,7 @@
                 <Border
                     Background="{DynamicResource WindowButtonBackgroundColor}"
                     BorderBrush="{DynamicResource MainBorderColor}"
-                    BorderThickness="0,0,1,1"
-                    CornerRadius="8,0,0,0"
+                    BorderThickness="0,0,1,0"
                     DockPanel.Dock="Left"
                     x:Name="TopWindowBorder">
                     <Image
@@ -45,12 +36,9 @@
 
                 <customControls:IconButton
                     Background="{DynamicResource MainButtonBackgroundColor}"
-                    BorderBrush="{DynamicResource MainBorderColor}"
-                    BorderThickness="0,0,1,1"
                     Classes="hover"
                     Click="Close"
                     ClickMode="Release"
-                    CornerRadius="0,8,0,0"
                     Data="{StaticResource CloseGeometry}"
                     DockPanel.Dock="Right"
                     Foreground="{DynamicResource MainTextColor}"
@@ -64,7 +52,7 @@
                 <customControls:IconButton
                     Background="{DynamicResource MainButtonBackgroundColor}"
                     BorderBrush="{DynamicResource MainBorderColor}"
-                    BorderThickness="1,0,1,1"
+                    BorderThickness="1,0,1,0"
                     Classes="hover"
                     Click="Minimize"
                     ClickMode="Release"

src/PicView.Avalonia.Win32/Views/SettingsWindow.axaml

@@ -6,23 +6,17 @@
     SizeToContent="WidthAndHeight"
     Title="Loading..."
     WindowStartupLocation="CenterOwner"
-    mc:Ignorable="d"
     x:Class="PicView.Avalonia.Win32.Views.SettingsWindow"
     x:DataType="viewModels:MainViewModel"
     xmlns="https://github.com/avaloniaui"
     xmlns:customControls="clr-namespace:PicView.Avalonia.CustomControls;assembly=PicView.Avalonia"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels;assembly=PicView.Avalonia"
     xmlns:views="clr-namespace:PicView.Avalonia.Views;assembly=PicView.Avalonia"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.DataContext>
-        <viewModels:MainViewModel />
-    </Design.DataContext>
+
     <Border
         BorderBrush="{DynamicResource WindowBorderColor}"
         BorderThickness="1"
-        CornerRadius="8"
         PointerPressed="MoveWindow"
         x:Name="ParentBorder">
         <Panel>
@@ -34,7 +28,6 @@
                     Background="{DynamicResource WindowButtonBackgroundColor}"
                     BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="0,0,1,1"
-                    CornerRadius="8,0,0,0"
                     DockPanel.Dock="Left"
                     x:Name="TopWindowBorder">
                     <Image
@@ -51,7 +44,6 @@
                     Classes="hover"
                     Click="Close"
                     ClickMode="Release"
-                    CornerRadius="0,8,0,0"
                     Data="{StaticResource CloseGeometry}"
                     DockPanel.Dock="Right"
                     Foreground="{DynamicResource MainTextColor}"

src/PicView.Avalonia.Win32/Views/SingleImageResizeWindow.axaml

@@ -4,25 +4,17 @@
     CornerRadius="8"
     SizeToContent="WidthAndHeight"
     Title="Loading..."
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d"
     x:Class="PicView.Avalonia.Win32.Views.SingleImageResizeWindow"
     x:DataType="viewModels:MainViewModel"
     xmlns="https://github.com/avaloniaui"
     xmlns:customControls="clr-namespace:PicView.Avalonia.CustomControls;assembly=PicView.Avalonia"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels;assembly=PicView.Avalonia"
     xmlns:views="clr-namespace:PicView.Avalonia.Views;assembly=PicView.Avalonia"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.DataContext>
-        <viewModels:MainViewModel />
-    </Design.DataContext>
+
     <Border
         BorderBrush="{DynamicResource WindowBorderColor}"
         BorderThickness="1"
-        CornerRadius="8"
         PointerPressed="MoveWindow"
         x:Name="ParentBorder">
         <StackPanel>
@@ -33,7 +25,6 @@
                     Background="{DynamicResource WindowButtonBackgroundColor}"
                     BorderBrush="{DynamicResource MainBorderColor}"
                     BorderThickness="0,0,1,0"
-                    CornerRadius="8,0,0,0"
                     DockPanel.Dock="Left"
                     x:Name="IconBorder">
                     <Image
@@ -49,7 +40,6 @@
                     Classes="hover"
                     Click="Close"
                     ClickMode="Release"
-                    CornerRadius="0,8,0,0"
                     Data="{StaticResource CloseGeometry}"
                     DockPanel.Dock="Right"
                     Foreground="{DynamicResource MainTextColor}"

src/PicView.Avalonia.Win32/Views/WinMainWindow.axaml

@@ -1,6 +1,5 @@
 <Window
     CanResize="{CompiledBinding CanResize}"
-    CornerRadius="0,0,8,8"
     Icon="/icon.ico"
     MinHeight="{CompiledBinding WindowMinSize}"
     MinWidth="{CompiledBinding WindowMinSize}"
@@ -10,26 +9,15 @@
                             Mode=OneWay}"
     TransparencyBackgroundFallback="{StaticResource MenuBackgroundColor}"
     TransparencyLevelHint="AcrylicBlur"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d"
     x:Class="PicView.Avalonia.Win32.Views.WinMainWindow"
     x:DataType="viewModels:MainViewModel"
     xmlns="https://github.com/avaloniaui"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels;assembly=PicView.Avalonia"
     xmlns:views="clr-namespace:PicView.Avalonia.Views;assembly=PicView.Avalonia"
     xmlns:views1="clr-namespace:PicView.Avalonia.Win32.Views"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.DataContext>
-        <viewModels:MainViewModel />
-    </Design.DataContext>
 
-    <Border
-        BorderBrush="{DynamicResource WindowBorderColor}"
-        BorderThickness="1"
-        CornerRadius="8">
+    <Border BorderBrush="{DynamicResource WindowBorderColor}" BorderThickness="1">
         <DockPanel LastChildFill="True">
             <views1:WinTitleBar DockPanel.Dock="Top" x:Name="Titlebar" />
             <views:BottomBar DockPanel.Dock="Bottom" x:Name="BottomBar" />

src/PicView.Avalonia.Win32/Views/WinTitleBar.axaml

@@ -3,28 +3,18 @@
                              Mode=OneWay}"
     IsVisible="{CompiledBinding IsTopToolbarShown,
                                 Mode=OneWay}"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d"
     x:Class="PicView.Avalonia.Win32.Views.WinTitleBar"
     x:DataType="vm:MainViewModel"
     xmlns="https://github.com/avaloniaui"
     xmlns:customControls="clr-namespace:PicView.Avalonia.CustomControls;assembly=PicView.Avalonia"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:uc="clr-namespace:PicView.Avalonia.Views.UC;assembly=PicView.Avalonia"
     xmlns:vm="clr-namespace:PicView.Avalonia.ViewModels;assembly=PicView.Avalonia"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Design.DataContext>
-        <vm:MainViewModel />
-    </Design.DataContext>
-
     <Border
         Background="{DynamicResource WindowBackgroundColor}"
         BorderBrush="{DynamicResource MainBorderColor}"
         BorderThickness="0,0,0,1"
-        CornerRadius="8,8,0,0"
         x:Name="TopWindowBorder">
         <DockPanel LastChildFill="True">
 
@@ -96,11 +86,9 @@
             <customControls:IconButton
                 Background="{DynamicResource WindowButtonBackgroundColor}"
                 BorderBrush="{DynamicResource MainBorderColor}"
-                BorderThickness="0,0,1,0"
                 Classes="hover"
                 ClickMode="Release"
                 Command="{CompiledBinding ExitCommand}"
-                CornerRadius="0,8,0,0"
                 Data="{StaticResource CloseGeometry}"
                 DockPanel.Dock="Right"
                 Foreground="{DynamicResource MainTextColor}"

src/PicView.Avalonia/Views/BottomBar.axaml

@@ -7,9 +7,6 @@
     xmlns:customControls="clr-namespace:PicView.Avalonia.CustomControls"
     xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.DataContext>
-        <viewModels:MainViewModel />
-    </Design.DataContext>
 
     <UserControl.ContextMenu>
         <ContextMenu x:Name="MainContextMenu">
@@ -164,7 +161,6 @@
         Background="{DynamicResource WindowBackgroundColor}"
         BorderBrush="{DynamicResource MainBorderColor}"
         BorderThickness="0,1,0,0"
-        CornerRadius="0,0,8,8"
         Height="{CompiledBinding BottombarHeight,
                                  Mode=OneWay}"
         x:Name="MainBottomBorder">

src/PicView.Avalonia/Views/BottomBar.axaml.cs

@@ -1,3 +1,4 @@
+using System.Runtime.InteropServices;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
@@ -14,6 +15,12 @@ public partial class BottomBar : UserControl
     {
         InitializeComponent();
 
+        // Set corner radius on macOS
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+        {
+            MainBottomBorder.CornerRadius = new CornerRadius(0, 0, 8, 8);
+        }
+        
         Loaded += delegate
         {
             PointerPressed += (_, e) => MoveWindow(e);