chore: Upgrade Avalonia to 12.0 and migrate codebase by yuto-trd · Pull Request #1673 · b-editor/beutl

yuto-trd · 2026-04-15T03:53:57Z

Description

Upgrade Avalonia from 11.x to 12.0 and update related dependencies across the solution (Directory.Packages.props, csproj files).
Migrate codebase to Avalonia 12 APIs: ReflectionBinding for dynamic bindings, x:DataType for compiled bindings, PlaceholderText, FocusChangedEventArgs, Math.Clamp, Avalonia.Input.Platform namespace, logical-tree traversal, and TopLevel-based scaling.
Replace Avalonia.Diagnostics with AvaloniaUI.DiagnosticsSupport (WithDeveloperTools()), remove the custom BcTabItem/BcTabView/DirectoryTreeView controls, and migrate UI to FluentAvalonia (FA) components including the renamed Beutl.FluentIcons.FluentAvalonia package.
Drop the obsolete DirectoryViewTest project and adjust several window/editor views (styles, drag handling, IListEditorViewModel.IsEnabled, etc.) for consistency under the new framework.

Breaking changes

Extensions depending on the custom BcTabItem/BcTabView or DirectoryTreeView controls must migrate to the FluentAvalonia equivalents, since these controls were removed.
Extensions referencing the FluentIcons.FluentAvalonia package must switch to Beutl.FluentIcons.FluentAvalonia.
Targeting Avalonia 12 means extensions must be recompiled against the new Avalonia 12 API surface.

Fixed issues

None

+    // needs to know the exact types at compile time.
+
+    [DllImport("/usr/lib/libobjc.A.dylib")]
+    private static extern IntPtr objc_getClass(string name);


+    private static extern IntPtr objc_getClass(string name);
+
+    [DllImport("/usr/lib/libobjc.A.dylib")]
+    private static extern IntPtr sel_registerName(string name);


+    private static extern IntPtr sel_registerName(string name);
+
+    [DllImport("/usr/lib/libobjc.A.dylib", EntryPoint = "objc_msgSend")]
+    private static extern IntPtr objc_msgSend_ret(IntPtr receiver, IntPtr selector);


+    private static extern IntPtr objc_msgSend_ret(IntPtr receiver, IntPtr selector);
+
+    [DllImport("/usr/lib/libobjc.A.dylib", EntryPoint = "objc_msgSend")]
+    private static extern void objc_msgSend_arg(IntPtr receiver, IntPtr selector, IntPtr arg);


+    private static extern void objc_msgSend_arg(IntPtr receiver, IntPtr selector, IntPtr arg);
+
+    [DllImport("/usr/lib/libobjc.A.dylib", EntryPoint = "objc_msgSend")]
+    private static extern IntPtr objc_msgSend_arg_ret(IntPtr receiver, IntPtr selector, IntPtr arg);


+    private static extern IntPtr objc_msgSend_arg_ret(IntPtr receiver, IntPtr selector, IntPtr arg);
+
+    [DllImport("/usr/lib/libobjc.A.dylib", EntryPoint = "objc_msgSend")]
+    private static extern void objc_msgSend_bool(IntPtr receiver, IntPtr selector, [MarshalAs(UnmanagedType.I1)] bool arg);


+    private static extern void objc_msgSend_bool(IntPtr receiver, IntPtr selector, [MarshalAs(UnmanagedType.I1)] bool arg);
+
+    [DllImport("/usr/lib/libobjc.A.dylib", EntryPoint = "objc_msgSend")]
+    private static extern void objc_msgSend_long(IntPtr receiver, IntPtr selector, long arg);


+
+            // remove the toolbar to restore the default thin title bar
+            if (_nsWindow != IntPtr.Zero && _selSetToolbar != IntPtr.Zero)
+                objc_msgSend_arg(_nsWindow, _selSetToolbar, IntPtr.Zero);


+
+                // 2. cache ObjC selectors used during setup and fullscreen transitions.
+                //    sel_registerName returns a stable pointer for the lifetime of the process.
+                _selSetToolbar = sel_registerName("setToolbar:");


+                // 2. cache ObjC selectors used during setup and fullscreen transitions.
+                //    sel_registerName returns a stable pointer for the lifetime of the process.
+                _selSetToolbar = sel_registerName("setToolbar:");
+                _selSetTitlebarAppearsTransparent = sel_registerName("setTitlebarAppearsTransparent:");


coderabbitai · 2026-06-21T16:56:22Z

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: 3a1f09e1-cdcf-405c-9e01-b057f4e95762

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch yuto-trd/migrate-avalonia-12

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

github-actions · 2026-06-22T17:01:15Z

Package	Line Rate	Branch Rate	Complexity	Health
Beutl.Api	0%	0%	1160	➖
Beutl.Configuration	41%	22%	350	➖
Beutl.Controls	0%	0%	5336	➖
Beutl.Core	62%	56%	3069	➖
Beutl.Editor	78%	70%	1734	➖
Beutl.Editor.Components	0%	0%	8548	➖
Beutl.Embedding.MediaFoundation	4%	1%	1354	➖
Beutl.Engine	60%	50%	18071	➖
Beutl.Extensibility	38%	59%	112	➖
Beutl.Extensions.AVFoundation	5%	12%	246	➖
Beutl.Extensions.FFmpeg	5%	5%	856	➖
Beutl.FFmpegIpc	22%	27%	799	➖
Beutl.Language	7%	50%	1348	➖
Beutl.NodeGraph	24%	15%	2474	➖
Beutl.ProjectSystem	58%	43%	1061	➖
Beutl.Threading	100%	90%	137	✔
Beutl.Utilities	94%	87%	358	✔
Summary	33% (40807 / 122650)	29% (10236 / 34730)	47013	➖

Minimum allowed line rate is 0%

…port and use WithDeveloperTools()

…nding

…inding

…istency

…nsistency

…op handling

… for consistency

…proved data binding

…styles

…ndling

…rface

… structure

…ndicator to core object editors

…base main側で追加された新規コードがリベース後も移行前のAPIを参照していたため修正: - FluentAvalonia 3.0 のFA接頭辞付き型へ移行 (ContentDialog/IconSource/PickerFlyoutBase/SymbolIcon 等 -> FA*) - Avalonia 12 で非公開化した Visual.GetVisualRoot() を IsAttachedToVisualTree() へ置換対象: WindowCaptureDialog, CrashRecoveryPromptTask, ToolWindowExtension, ExtensionsToolWindowExtension, OutputPickerFlyoutPresenter, HistoryView, MarkerEditFlyout, OutputPickerFlyout, OutputTab, MainView, CommandPaletteView, SampleToolWindowExtension

- FluentAvaloniaUI: 3.0.0-preview4 -> 3.0.0 - AvaloniaUI.DiagnosticsSupport: 2.2.2 -> 2.2.3 - Svg.Controls.Skia.Avalonia: 12.0.0.11 -> 12.0.0.13 Claude-Session: https://claude.ai/code/session_01RJjpa89ubCWUGqXcPzb4oS

… rebase The 003 pipeline (#1886) added SaveFrameDialog and the frame-save context menu against FluentAvalonia's ContentDialog, but this branch had already migrated dialogs to FAContentDialog (FluentAvalonia 3.0). The rebase replayed that migration under the newer code, so update these call sites to FAContentDialog/FAContentDialogResult to match the other dialogs. Claude-Session: https://claude.ai/code/session_01GJAqiaJzpB1pQFqnQhMoEf

drift-check

Code Review Bot flagged 1 possible comment/code divergence(s). These are advisory.

Results are for commit cc1f40c. On newer commits, the bot's summary comment reflects the latest run.

drift-check · 2026-07-12T14:21:53Z

+                        added 1px left margin, otherwise we can get strange artifacts while
+                        animating, I'm guessing from bad invalidation rects?


Comment may no longer match the code (info)

The comment states a 1px left margin was added, but the actual code has a left margin of 2 (Margin="2,0,0,0").

Current comment:

added 1px left margin, otherwise we can get strange artifacts while animating, I'm guessing from bad invalidation rects?

Suggested update:

added 2px left margin, otherwise we can get strange artifacts while animating, I'm guessing from bad invalidation rects?

drift-check · 2026-07-12T14:21:55Z

Code Review Bot

No comment/code divergences or documentation drift detected. Reviewed 98 file(s); skipped 103.

github-actions · 2026-07-13T02:07:21Z

No TODO comments were found.

yuto-trd force-pushed the yuto-trd/migrate-avalonia-12 branch 2 times, most recently from 49ae40e to c71c40c Compare April 27, 2026 08:19

yuto-trd force-pushed the yuto-trd/migrate-avalonia-12 branch from c71c40c to ac43186 Compare June 6, 2026 15:55

github-code-quality Bot found potential problems Jun 6, 2026

View reviewed changes

yuto-trd force-pushed the yuto-trd/migrate-avalonia-12 branch from b369dbe to cefcc81 Compare June 22, 2026 16:56

yuto-trd added 23 commits July 12, 2026 22:07

chore: upgrade Avalonia to 12.0 and related dependencies

f2e12d0

refactor: replace Avalonia.Diagnostics with AvaloniaUI.DiagnosticsSup…

ead2e52

…port and use WithDeveloperTools()

refactor: remove DirectoryViewTest project and related files

531ec88

refactor: remove custom BcTabItem and BcTabView controls

194be78

refactor: migrate to FA components across the application

1c2a8ab

refactor: replace Binding with ReflectionBinding for improved data bi…

577a6a7

…nding

refactor: add x:DataType attributes to XAML files for improved data b…

ae6356c

…inding

refactor: replace MathHelpers.Clamp with Math.Clamp for improved cons…

de22538

…istency

refactor: replace Watermark with PlaceholderText in XAML files for co…

4719d70

…nsistency

refactor: store last PointerPressedEventArgs for improved drag-and-dr…

460f410

…op handling

refactor: update GotFocus event handlers to use FocusChangedEventArgs…

4729d1b

… for consistency

refactor: replace Binding with ReflectionBinding in XAML files for im…

aec8860

…proved data binding

refactor: update window decoration properties for consistency across …

9acc282

…styles

refactor: add Avalonia.Input.Platform namespace for improved input ha…

cfa7211

…ndling

refactor: add IsEnabled property and update IListEditorViewModel inte…

2559b69

…rface

refactor: update scaling retrieval to use TopLevel for improved accuracy

517162f

refactor: update visual tree methods to use logical tree for improved…

47482d8

… structure

refactor: add IsEnabled property synchronization and IsEngineObject i…

24b8aa4

…ndicator to core object editors

refactor: synchronize CurrentCulture with UICulture in Program.cs

c11a0d4

chore: update package versions for Avalonia 12 compatibility

094b5bf

chore: update package versions for Avalonia 12 compatibility

67bad34

feat: add macOS thick title bar support

a8c9304

yuto-trd added 5 commits July 12, 2026 22:12

refactor: migrate MainView to Avalonia 12 WindowDecorationProperties API

8665798

fix: adjust title bar settings for MainView and MainWindow

63dc5ff

chore: update Avalonia ecosystem packages to latest stable

37dd011

- FluentAvaloniaUI: 3.0.0-preview4 -> 3.0.0 - AvaloniaUI.DiagnosticsSupport: 2.2.2 -> 2.2.3 - Svg.Controls.Skia.Avalonia: 12.0.0.11 -> 12.0.0.13 Claude-Session: https://claude.ai/code/session_01RJjpa89ubCWUGqXcPzb4oS

fix: reconcile icons after Avalonia 12 rebase

e396edd

yuto-trd force-pushed the yuto-trd/migrate-avalonia-12 branch 2 times, most recently from b6a1014 to e69347e Compare July 12, 2026 14:12

fix: use FluentIconSource for updated Fluent icons

cc1f40c

yuto-trd force-pushed the yuto-trd/migrate-avalonia-12 branch from e69347e to cc1f40c Compare July 12, 2026 14:14

drift-check Bot reviewed Jul 12, 2026

View reviewed changes

fix: resolve storage picker top-level lookup

6648d59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

chore: Upgrade Avalonia to 12.0 and migrate codebase#1673

chore: Upgrade Avalonia to 12.0 and migrate codebase#1673
yuto-trd wants to merge 30 commits into
mainfrom
yuto-trd/migrate-avalonia-12

yuto-trd commented Apr 15, 2026

Uh oh!

coderabbitai Bot commented Jun 21, 2026 •

edited

Loading

Review skipped

Uh oh!

github-actions Bot commented Jun 22, 2026

Uh oh!

drift-check Bot left a comment

Uh oh!

drift-check Bot Jul 12, 2026

Uh oh!

drift-check Bot commented Jul 12, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Jul 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

		added 1px left margin, otherwise we can get strange artifacts while
		animating, I'm guessing from bad invalidation rects?

Uh oh!

Uh oh!

Conversation

yuto-trd commented Apr 15, 2026

Description

Breaking changes

Fixed issues

Uh oh!

coderabbitai Bot commented Jun 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

github-actions Bot commented Jun 22, 2026

Uh oh!

drift-check Bot left a comment

Choose a reason for hiding this comment

Uh oh!

drift-check Bot Jul 12, 2026

Choose a reason for hiding this comment

Uh oh!

drift-check Bot commented Jul 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Review Bot

Uh oh!

github-actions Bot commented Jul 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

coderabbitai Bot commented Jun 21, 2026 •

edited

Loading

drift-check Bot commented Jul 12, 2026 •

edited

Loading