releases/ClaudeDo
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases 12 Wiki Activity

fix(ui): manual modal dragging, maximize/restore icon, day-toggle style

Browse Source 
- Drive modal title-bar dragging manually via pointer capture + Window.Position;
  Avalonia 12's BeginMoveDrag and VisualRoot-as-Window cast no longer work
  (VisualRoot is a TopLevelHost). Applies to ModalShell and WorktreeModalView.
- Toggle the MainWindow maximize button between maximize/restore glyphs on
  WindowState changes (adds Icon.WinRestore geometry).
- Add the ToggleButton.day-toggle style used by the Prime weekday picker row.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
mika kuns
2026-06-02 17:02:56 +02:00
parent 26998f05ff
commit f1715a34fa
6 changed files with 99 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/ClaudeDo.Ui/Views/Controls/ModalShell.axaml.cs
View File

@@ -1,4 +1,3 @@
using System;
using System.Windows.Input;
using Avalonia;
using Avalonia.Controls;
@@ -23,16 +22,49 @@ public class ModalShell : ContentControl
public object? Footer { get => GetValue(FooterProperty); set => SetValue(FooterProperty, value); }
public ICommand? CloseCommand { get => GetValue(CloseCommandProperty); set => SetValue(CloseCommandProperty, value); }
private Window? _window;
private PixelPoint _dragStartScreen;
private PixelPoint _dragStartPos;
private bool _dragging;
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
base.OnApplyTemplate(e);
if (e.NameScope.Find<Border>("PART_TitleBar") is { } bar)
{
bar.PointerPressed += OnTitleBarPressed;
bar.PointerMoved += OnTitleBarMoved;
bar.PointerReleased += OnTitleBarReleased;
}
}
// VisualRoot is a TopLevelHost (not the Window) in Avalonia 12, so resolve the
// owning Window via TopLevel.GetTopLevel and drive the move manually — BeginMoveDrag
// and a VisualRoot-as-Window cast both fail here.
private void OnTitleBarPressed(object? sender, PointerPressedEventArgs e)
{
if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed && VisualRoot is Window w)
w.BeginMoveDrag(e);
if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) return;
_window = TopLevel.GetTopLevel(this) as Window;
if (_window is null) return;
_dragStartScreen = _window.PointToScreen(e.GetPosition(_window));
_dragStartPos = _window.Position;
_dragging = true;
e.Pointer.Capture(sender as IInputElement);
}
private void OnTitleBarMoved(object? sender, PointerEventArgs e)
{
if (!_dragging || _window is null
|| !e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) return;
var cur = _window.PointToScreen(e.GetPosition(_window));
_window.Position = new PixelPoint(
_dragStartPos.X + (cur.X - _dragStartScreen.X),
_dragStartPos.Y + (cur.Y - _dragStartScreen.Y));
}
private void OnTitleBarReleased(object? sender, PointerReleasedEventArgs e)
{
_dragging = false;
e.Pointer.Capture(null);
}
}

2
src/ClaudeDo.Ui/Views/MainWindow.axaml
View File

@@ -82,7 +82,7 @@
<PathIcon Data="{StaticResource Icon.WinMin}" Width="10" Height="10"/>
</Button>
<Button Classes="title-ctrl" Click="OnToggleMax">
<PathIcon Data="{StaticResource Icon.WinMax}" Width="10" Height="10"/>
<PathIcon x:Name="MaxIcon" Data="{StaticResource Icon.WinMax}" Width="10" Height="10"/>
</Button>
<Button Classes="title-ctrl close" Click="OnClose">
<PathIcon Data="{StaticResource Icon.WinClose}" Width="10" Height="10"/>

15
src/ClaudeDo.Ui/Views/MainWindow.axaml.cs
View File

@@ -19,6 +19,21 @@ public partial class MainWindow : Window
InitializeComponent();
KeyDown += OnWindowKeyDown;
DataContextChanged += OnDataContextChanged;
UpdateMaxIcon();
}
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
{
base.OnPropertyChanged(change);
if (change.Property == WindowStateProperty)
UpdateMaxIcon();
}
private void UpdateMaxIcon()
{
var key = WindowState == WindowState.Maximized ? "Icon.WinRestore" : "Icon.WinMax";
if (this.TryFindResource(key, out var geometry) && geometry is Geometry g)
MaxIcon.Data = g;
}
private void OnDataContextChanged(object? sender, EventArgs e)

5
src/ClaudeDo.Ui/Views/Modals/WorktreeModalView.axaml
View File

@@ -28,7 +28,10 @@
<!-- Title strip -->
<Border DockPanel.Dock="Top" Height="36"
PointerPressed="OnTitleBarPressed">
Background="Transparent"
PointerPressed="OnTitleBarPressed"
PointerMoved="OnTitleBarMoved"
PointerReleased="OnTitleBarReleased">
<Grid ColumnDefinitions="*,Auto" Margin="14,0">
<TextBlock Grid.Column="0" Text="Worktree" VerticalAlignment="Center"
FontFamily="{DynamicResource MonoFont}" FontSize="{StaticResource FontSizeBody}"

26
src/ClaudeDo.Ui/Views/Modals/WorktreeModalView.axaml.cs
View File

@@ -66,9 +66,31 @@ public partial class WorktreeModalView : Window
e.Handled = true;
}
private PixelPoint _dragStartScreen;
private PixelPoint _dragStartPos;
private bool _dragging;
private void OnTitleBarPressed(object? sender, PointerPressedEventArgs e)
{
if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
BeginMoveDrag(e);
if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) return;
_dragStartScreen = this.PointToScreen(e.GetPosition(this));
_dragStartPos = Position;
_dragging = true;
e.Pointer.Capture(sender as IInputElement);
}
private void OnTitleBarMoved(object? sender, PointerEventArgs e)
{
if (!_dragging || !e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) return;
var cur = this.PointToScreen(e.GetPosition(this));
Position = new PixelPoint(
_dragStartPos.X + (cur.X - _dragStartScreen.X),
_dragStartPos.Y + (cur.Y - _dragStartScreen.Y));
}
private void OnTitleBarReleased(object? sender, PointerReleasedEventArgs e)
{
_dragging = false;
e.Pointer.Capture(null);
}
}