Update to Avalonia 11 RC 1 #308
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Numpsy
commented
May 30, 2023
| @@ -17,7 +18,7 @@ type MainWindow() as this = | |||
| base.Height <- 600.0 | |||
| base.Width <- 800.0 | |||
|
|
|||
| this.VisualRoot.Renderer.Diagnostics.DebugOverlays <- Avalonia.Rendering.RendererDebugOverlays.Fps | |||
| TopLevel.GetTopLevel(this).RendererDiagnostics.DebugOverlays <- Avalonia.Rendering.RendererDebugOverlays.Fps | |||
There was a problem hiding this comment.
Numpsy
commented
May 30, 2023
| // static member clock<'t when 't :> Animatable>(clock: IClock) : IAttr<'t> = |
There was a problem hiding this comment.
There was a problem hiding this comment.
Ok to just remove these commented out bits?
Numpsy
commented
May 30, 2023
| @@ -10,7 +10,7 @@ module MenuBase = | |||
| type MenuBase with | |||
|
|
|||
| static member onMenuOpened<'t when 't :> MenuBase>(func: RoutedEventArgs -> unit, ?subPatchOptions) : IAttr<'t> = | |||
| AttrBuilder<'t>.CreateSubscription(MenuBase.MenuOpenedEvent, func, ?subPatchOptions = subPatchOptions); | |||
| AttrBuilder<'t>.CreateSubscription(MenuBase.OpenedEvent, func, ?subPatchOptions = subPatchOptions); | |||
There was a problem hiding this comment.
Numpsy
commented
May 30, 2023
| let create (attrs: IAttr<TabItem> list): IView<TabItem> = | ||
| ViewBuilder.Create<TabItem>(attrs) | ||
|
|
||
| type TabItem with | ||
|
|
||
| static member tabStripPlacement<'t when 't :> TabItem>(placement: Dock) : IAttr<'t> = | ||
| AttrBuilder<'t>.CreateProperty<Dock>(TabItem.TabStripPlacementProperty, placement, ValueNone) | ||
| static member tabStripPlacement<'t when 't :> TabItem>(placement: Dock Nullable) : IAttr<'t> = |
There was a problem hiding this comment.
Numpsy
commented
May 30, 2023
| @@ -13,8 +13,8 @@ module TransitioningContentControl = | |||
|
|
|||
| type TransitioningContentControl with | |||
|
|
|||
| static member currentContent<'t when 't :> TransitioningContentControl>(value: obj) : IAttr<'t> = | |||
| AttrBuilder<'t>.CreateProperty<obj>(TransitioningContentControl.CurrentContentProperty, value, ValueNone) | |||
| //static member currentContent<'t when 't :> TransitioningContentControl>(value: obj) : IAttr<'t> = | |||
There was a problem hiding this comment.
Numpsy
commented
May 30, 2023
| @@ -16,7 +16,7 @@ module rec VirtualDom = | |||
| let delta = Differ.diff(last, next) | |||
| Patcher.patch(root, delta) | |||
|
|
|||
| let updateRoot (host: IContentControl, last: IView option, next: IView option) = | |||
| let updateRoot (host: ContentControl, last: IView option, next: IView option) = | |||
| let root : Control voption = | |||
There was a problem hiding this comment.
Numpsy
commented
May 30, 2023
| @@ -18,5 +18,4 @@ module Extensions = | |||
| if uri.IsAbsoluteUri && uri.IsFile then | |||
| new Bitmap(uri.LocalPath) | |||
| else | |||
| let assets = AvaloniaLocator.Current.GetService<IAssetLoader>(); | |||
| new Bitmap(assets.Open(uri)); | |||
| new Bitmap(AssetLoader.Open(uri)) | |||
There was a problem hiding this comment.
Numpsy
force-pushed
the
rw/avalonia_nights_reprise
branch
from
78c5559
to
b5f74a1
Compare
|
Ok, Avalonia 11 now has an actual release candidate package available :-) |
|
So it's building ok, and the control catalog seems to work :-) There are a bunch of new warnings about some style related things being deprecated, that I haven't looked at, e.g. |
sleepyfran
approved these changes
Jun 9, 2023
There was a problem hiding this comment.
Amazing job! We can definitely merge with the warnings, since the deprecation notice is for v12 we can either attempt to address it in a separate PR before the final v11 release (if any of us have any time to do so) or just fix all of them once they're removed in v12 :^)
|
I'm merging this. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Just another set of test changes to build with the latest Avalonia 11 nightly, as you can never break too many things