Skip to content

Fix top-right corner close targets #361

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

Merged
Ruben2776 merged 2 commits into from
Jul 22, 2026
Merged

Fix top-right corner close targets #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e58b74
Fix top-right corner close targets
aladin7 Jul 21, 2026
c399aa9
Address native interop review feedback
aladin7 Jul 22, 2026
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
6 changes: 5 additions & 1 deletion src/PicView.Avalonia.Win32/Views/AboutWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@
x:Name="ParentBorder">
<StackPanel>

<DockPanel Height="28" LastChildFill="True">
<DockPanel
Height="28"
Margin="0,-1,-1,0"
LastChildFill="True">

<Border
Background="{DynamicResource WindowButtonBackgroundColor}"
Expand Down Expand Up @@ -47,6 +50,7 @@
IconWidth="10"
IsRepeatEnabled="False"
Width="30"
WindowDecorationProperties.ElementRole="CloseButton"
x:Name="CloseButton" />

<customControls:IconButton
Expand Down
2 changes: 1 addition & 1 deletion src/PicView.Avalonia.Win32/Views/AboutWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace PicView.Avalonia.Win32.Views;

public partial class AboutWindow : GenericWindow, IPlatformSpecificUpdate
public partial class AboutWindow : Win32GenericWindow, IPlatformSpecificUpdate
{
public AboutWindow()
{
Expand Down
4 changes: 3 additions & 1 deletion src/PicView.Avalonia.Win32/Views/BatchResizeResizeWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

<DockPanel
Height="{StaticResource TopBorderHeight}"
Margin="0,-1,-1,0"
DockPanel.Dock="Top"
LastChildFill="True">

Expand Down Expand Up @@ -46,7 +47,8 @@
Foreground="{DynamicResource MainTextColor}"
IconHeight="10"
IconWidth="10"
IsRepeatEnabled="False" />
IsRepeatEnabled="False"
WindowDecorationProperties.ElementRole="CloseButton" />

<customControls:IconButton
x:Name="MinimizeButton"
Expand Down
2 changes: 1 addition & 1 deletion src/PicView.Avalonia.Win32/Views/BatchResizeResizeWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace PicView.Avalonia.Win32.Views;

public partial class BatchResizeWindow : GenericWindow, IDisposable
public partial class BatchResizeWindow : Win32GenericWindow, IDisposable
{
private DisposableBag _disposables;
public BatchResizeWindow(BatchResizeWindowConfig config)
Expand Down
4 changes: 3 additions & 1 deletion src/PicView.Avalonia.Win32/Views/ConvertWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

<DockPanel
Height="28"
Margin="0,-1,-1,0"
Background="Transparent"
LastChildFill="True"
PointerPressed="MoveWindow">
Expand Down Expand Up @@ -47,7 +48,8 @@
Foreground="{DynamicResource MainTextColor}"
IconHeight="10"
IconWidth="10"
IsRepeatEnabled="False" />
IsRepeatEnabled="False"
WindowDecorationProperties.ElementRole="CloseButton" />

<customControls:IconButton
x:Name="MinimizeButton"
Expand Down
2 changes: 1 addition & 1 deletion src/PicView.Avalonia.Win32/Views/ConvertWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace PicView.Avalonia.Win32.Views;

public partial class ConvertWindow : GenericWindow
public partial class ConvertWindow : Win32GenericWindow
{
public ConvertWindow()
{
Expand Down
2 changes: 2 additions & 0 deletions src/PicView.Avalonia.Win32/Views/EffectsWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<DockPanel
Background="{DynamicResource WindowSecondaryBackgroundColor}"
Height="28"
Margin="0,-1,-1,0"
LastChildFill="True"
PointerPressed="MoveWindow"
x:Name="TitleBarPanel">
Expand Down Expand Up @@ -49,6 +50,7 @@
IconWidth="10"
IsRepeatEnabled="False"
Width="30"
WindowDecorationProperties.ElementRole="CloseButton"
x:Name="CloseButton" />

<customControls:IconButton
Expand Down
2 changes: 1 addition & 1 deletion src/PicView.Avalonia.Win32/Views/EffectsWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace PicView.Avalonia.Win32.Views;

public partial class EffectsWindow : GenericWindow, IDisposable
public partial class EffectsWindow : Win32GenericWindow, IDisposable
{
private readonly CompositeDisposable _disposables = new();
public EffectsWindow(EffectsWindowConfig config)
Expand Down
4 changes: 3 additions & 1 deletion src/PicView.Avalonia.Win32/Views/FileAssociationWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

<DockPanel
Height="28"
Margin="0,-1,-1,0"
LastChildFill="True"
PointerPressed="MoveWindow">

Expand Down Expand Up @@ -49,7 +50,8 @@
Foreground="{DynamicResource MainTextColor}"
IconHeight="10"
IconWidth="10"
IsRepeatEnabled="False" />
IsRepeatEnabled="False"
WindowDecorationProperties.ElementRole="CloseButton" />

<customControls:IconButton
x:Name="MinimizeButton"
Expand Down
2 changes: 1 addition & 1 deletion src/PicView.Avalonia.Win32/Views/FileAssociationWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

namespace PicView.Avalonia.Win32.Views;

public partial class FileAssociationWindow : GenericWindow
public partial class FileAssociationWindow : Win32GenericWindow
{
private readonly List<(CheckBox CheckBox, string SearchText)> _allCheckBoxes = [];
private readonly CompositeDisposable _disposables = new();
Expand Down
4 changes: 3 additions & 1 deletion src/PicView.Avalonia.Win32/Views/ImageInfoWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<DockPanel
x:Name="TopWindowBorder"
Height="28"
Margin="0,-1,-1,0"
Background="{DynamicResource WindowBackgroundColor}"
DockPanel.Dock="Top"
LastChildFill="True">
Expand All @@ -50,7 +51,8 @@
Foreground="{DynamicResource MainTextColor}"
IconHeight="10"
IconWidth="10"
IsRepeatEnabled="False" />
IsRepeatEnabled="False"
WindowDecorationProperties.ElementRole="CloseButton" />

<customControls:IconButton
x:Name="MinimizeButton"
Expand Down
2 changes: 1 addition & 1 deletion src/PicView.Avalonia.Win32/Views/ImageInfoWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

namespace PicView.Avalonia.Win32.Views;

public partial class ImageInfoWindow: GenericWindow, IDisposable
public partial class ImageInfoWindow: Win32GenericWindow, IDisposable
{
private readonly CompositeDisposable _disposables = new();

Expand Down
4 changes: 3 additions & 1 deletion src/PicView.Avalonia.Win32/Views/KeybindingsWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

<DockPanel
Height="28"
Margin="0,-1,-1,0"
VerticalAlignment="Top"
LastChildFill="True">

Expand Down Expand Up @@ -50,7 +51,8 @@
IconWidth="10"
IsRepeatEnabled="False"
ToolTip.Tip="{CompiledBinding Translation.Close.Value,
Mode=OneWay}" />
Mode=OneWay}"
WindowDecorationProperties.ElementRole="CloseButton" />

<customControls:IconButton
x:Name="MinimizeButton"
Expand Down
2 changes: 1 addition & 1 deletion src/PicView.Avalonia.Win32/Views/KeybindingsWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace PicView.Avalonia.Win32.Views;

public partial class KeybindingsWindow : GenericWindow
public partial class KeybindingsWindow : Win32GenericWindow
{
public KeybindingsWindow(KeybindingWindowConfig config)
{
Expand Down
4 changes: 3 additions & 1 deletion src/PicView.Avalonia.Win32/Views/PrintPreviewWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

<DockPanel
Height="28"
Margin="0,-1,-1,0"
DockPanel.Dock="Top"
LastChildFill="True"
PointerPressed="MoveWindow">
Expand Down Expand Up @@ -49,7 +50,8 @@
Foreground="{DynamicResource MainTextColor}"
IconHeight="10"
IconWidth="10"
IsRepeatEnabled="False" />
IsRepeatEnabled="False"
WindowDecorationProperties.ElementRole="CloseButton" />

<customControls:IconButton
x:Name="MinimizeButton"
Expand Down
2 changes: 1 addition & 1 deletion src/PicView.Avalonia.Win32/Views/PrintPreviewWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace PicView.Avalonia.Win32.Views;

public partial class PrintPreviewWindow : PrintWindow
public partial class PrintPreviewWindow : Win32PrintWindow
{
public PrintPreviewWindow(PrintWindowConfig config)
{
Expand Down
8 changes: 6 additions & 2 deletions src/PicView.Avalonia.Win32/Views/SettingsWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@
BorderBrush="{DynamicResource MainBorderColor}"
BorderThickness="0,0,0,1"
DockPanel.Dock="Top">
<DockPanel VerticalAlignment="Top" LastChildFill="True">
<DockPanel
Margin="0,-1,-1,0"
VerticalAlignment="Top"
LastChildFill="True">
<Border
x:Name="LogoBorder"
Background="{DynamicResource WindowSecondaryBackgroundColor}"
Expand Down Expand Up @@ -96,7 +99,8 @@
IconWidth="10"
IsRepeatEnabled="False"
ToolTip.Tip="{CompiledBinding Translation.Close.Value,
Mode=OneWay}" />
Mode=OneWay}"
WindowDecorationProperties.ElementRole="CloseButton" />

<customControls:IconButton
x:Name="MinimizeButton"
Expand Down
2 changes: 1 addition & 1 deletion src/PicView.Avalonia.Win32/Views/SettingsWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

namespace PicView.Avalonia.Win32.Views;

public partial class SettingsWindow : GenericWindow
public partial class SettingsWindow : Win32GenericWindow
{

public SettingsWindow(SettingsWindowConfig config)
Expand Down
2 changes: 2 additions & 0 deletions src/PicView.Avalonia.Win32/Views/SingleImageResizeWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

<DockPanel
Height="{StaticResource TopBorderHeight}"
Margin="0,-1,-1,0"
LastChildFill="True"
PointerPressed="MoveWindow">

Expand Down Expand Up @@ -49,6 +50,7 @@
IconWidth="10"
IsRepeatEnabled="False"
Width="30"
WindowDecorationProperties.ElementRole="CloseButton"
x:Name="CloseButton" />

<customControls:IconButton
Expand Down
2 changes: 1 addition & 1 deletion src/PicView.Avalonia.Win32/Views/SingleImageResizeWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace PicView.Avalonia.Win32.Views;

public partial class SingleImageResizeWindow : GenericWindow
public partial class SingleImageResizeWindow : Win32GenericWindow
{
public SingleImageResizeWindow(MainWindowViewModel viewModel)
{
Expand Down
14 changes: 14 additions & 0 deletions src/PicView.Avalonia.Win32/Views/Win32GenericWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using PicView.Avalonia.CustomControls;
using PicView.Avalonia.Win32.WindowImpl;

namespace PicView.Avalonia.Win32.Views;

public class Win32GenericWindow : GenericWindow
{
protected Win32GenericWindow() => CaptionButtonCornerHandler.Attach(this);
}

public class Win32PrintWindow : PrintWindow
{
protected Win32PrintWindow() => CaptionButtonCornerHandler.Attach(this);
}
5 changes: 5 additions & 0 deletions src/PicView.Avalonia.Win32/Views/WinMainWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public WinMainWindow()
DataContext = mainWindowViewModel;

InitializeComponent();
CaptionButtonCornerHandler.Attach(this, () => IsCloseButtonEffectivelyVisible(mainWindowViewModel));

SharedBottomBar = BottomBar;
SharedTitleBar = Titlebar;
Expand All @@ -37,6 +38,10 @@ public WinMainWindow()
LoadedInitialization();
}

private bool IsCloseButtonEffectivelyVisible(MainWindowViewModel vm) =>
(Titlebar.IsEffectivelyVisible && vm.TopTitlebarViewModel.IsBtnPanelVisible.CurrentValue) ||
MainView.IsAlternativeCloseButtonEffectivelyVisible;

private void LoadedInitialization()
{
Loaded += delegate
Expand Down
4 changes: 3 additions & 1 deletion src/PicView.Avalonia.Win32/Views/WinTitleBar.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,6 +1012,7 @@
x:Name="WinBtnPanel"
DockPanel.Dock="Right"
IsVisible="{CompiledBinding TopTitlebarViewModel.IsBtnPanelVisible.Value}"
Margin="0,-1,-1,0"
Orientation="Horizontal">

<customControls:IconButton
Expand Down Expand Up @@ -1074,7 +1075,8 @@
Foreground="{DynamicResource MainTextColor}"
IconHeight="10"
IconWidth="10"
IsRepeatEnabled="False" />
IsRepeatEnabled="False"
WindowDecorationProperties.ElementRole="CloseButton" />

</StackPanel>

Expand Down
Loading
Loading