-
-
Notifications
You must be signed in to change notification settings - Fork 74
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.
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
Update to Avalonia 11 RC 1 #308
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
||
static member onMenuClosed<'t when 't :> MenuBase>(func: RoutedEventArgs -> unit, ?subPatchOptions) : IAttr<'t> = | ||
AttrBuilder<'t>.CreateSubscription(MenuBase.MenuClosedEvent, func, ?subPatchOptions = subPatchOptions); | ||
AttrBuilder<'t>.CreateSubscription(MenuBase.ClosedEvent, func, ?subPatchOptions = subPatchOptions); |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,14 +5,15 @@ module TabItem = | |
open Avalonia.Controls | ||
open Avalonia.FuncUI.Types | ||
open Avalonia.FuncUI.Builder | ||
|
||
open System | ||
|
||
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. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
AttrBuilder<'t>.CreateProperty<Dock Nullable>(TabItem.TabStripPlacementProperty, placement, ValueNone) | ||
|
||
static member isSelected<'t when 't :> TabItem>(value: bool) : IAttr<'t> = | ||
AttrBuilder<'t>.CreateProperty<bool>(TabItem.IsSelectedProperty, value, ValueNone) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
if host.Content <> null then | ||
match host.Content with | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<Project> | ||
<PropertyGroup> | ||
<AvaloniaVersion>11.0.0-preview8</AvaloniaVersion> | ||
<AvaloniaVersion>11.0.0-rc1.1</AvaloniaVersion> | ||
<FuncUIVersion>0.6.0-preview9.1</FuncUIVersion> | ||
</PropertyGroup> | ||
</Project> |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
refs AvaloniaUI/Avalonia#11552