Skip to content

Commit

Permalink
merge release/0.10.16 Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 5b647e1
Author: Dan Walmsley <[email protected]>
Date:   Thu Jul 7 11:12:04 2022 +0100

    bump version

commit fbce80d
Author: Dan Walmsley <[email protected]>
Date:   Thu Jul 7 11:16:53 2022 +0100

    Merge pull request AvaloniaUI#8433 from AvaloniaUI/fixes/8389-datagrid-detach

    Improve performance of style class selector subscriptions

commit 8cfa8a2
Author: Max Katz <[email protected]>
Date:   Wed Jul 6 16:42:52 2022 -0400

    Merge pull request AvaloniaUI#8456 from AvaloniaUI/fixes/splitview-culture-sensitive

    make splitview not culture sensitive.
    # Conflicts:
    #	src/Avalonia.Controls/SplitView.cs

commit a4279a5
Author: Dan Walmsley <[email protected]>
Date:   Wed Jul 6 15:45:17 2022 +0100

    fix setter tests.

commit 4823790
Author: Max Katz <[email protected]>
Date:   Sat Jul 2 22:09:50 2022 -0400

    Merge pull request AvaloniaUI#8409 from AvaloniaUI/fixes/devtools-promotes-values-to-localvalue

    Don't promote layout property values to local values in DevTools.

commit c4d7a98
Author: Tako <[email protected]>
Date:   Mon Jun 6 14:59:19 2022 +0300

    Merge pull request AvaloniaUI#8291 from AvaloniaUI/fix-fluent-loader

    Fix FluentTheme density style

commit 66c72be
Author: Steven Kirk <[email protected]>
Date:   Fri Jun 10 17:44:50 2022 +0200

    Merge pull request AvaloniaUI#8315 from AvaloniaUI/fixes/8314-gridsplitter-layoutrounding

    Make GridSplitter scaling aware.

commit 751fd6e
Author: Max Katz <[email protected]>
Date:   Wed Jun 22 17:58:15 2022 -0400

    Merge pull request AvaloniaUI#8373 from AvaloniaUI/fixes/8372-clear-local-value

    Correctly clear PriorityValue local value

commit 9d05161
Author: Jumar Macato <[email protected]>
Date:   Sat Jun 25 22:03:40 2022 +0800

    Merge pull request AvaloniaUI#8383 from Oxc3/bug-TimePickerPresenter-wrong-time-at-12PM

    Fix 12PM bug in TimePickerPresenter

commit 1c13b70
Author: Nikita Tsukanov <[email protected]>
Date:   Sun Jun 26 10:39:40 2022 +0300

    Merge pull request AvaloniaUI#8391 from AvaloniaUI/DirectBindingSubscription-NRE

    Fix DirectBindingSubscription NRE

commit 3878b13
Author: Steven Kirk <[email protected]>
Date:   Thu Jun 30 15:01:29 2022 +0200

    Merge pull request AvaloniaUI#8420 from AvaloniaUI/Takoooooo-patch-1

    Fix leak in the InternalSelectionModel

commit 26ee858
Author: Max Katz <[email protected]>
Date:   Sun Jul 3 04:15:20 2022 -0400

    Merge pull request AvaloniaUI#8427 from AvaloniaUI/fixes/7381-reparenting-control-crash

    Fix crash in deferred renderer when reparenting a control.

commit 0cbcc44
Author: Max Katz <[email protected]>
Date:   Sun Jul 3 10:14:15 2022 -0400

    Merge pull request AvaloniaUI#8431 from AvaloniaUI/remove-DottedLineFocusAdorner

    Remove perf-expensive DottedLineFocusAdorner style

commit b63d2cc
Author: Steven Kirk <[email protected]>
Date:   Mon Jul 4 16:46:11 2022 +0200

    Merge pull request AvaloniaUI#8440 from AvaloniaUI/fixes/osx-popups-dont-have-shadow

    [OSX] popups shouldnt have shadow

commit 3edae5a
Author: Max Katz <[email protected]>
Date:   Mon Jul 4 18:24:41 2022 -0400

    Merge pull request AvaloniaUI#8442 from AvaloniaUI/fixes/empty-batch-update

    Fix empty batch nested updates.

commit 7695205
Author: Dan Walmsley <[email protected]>
Date:   Wed Jul 6 14:40:46 2022 +0100

    win32, keep window size at all scale settings when entering and exiting fs mode.

commit 06c83fb
Merge: 277d94c af05fce
Author: Dan Walmsley <[email protected]>
Date:   Mon Jul 4 14:48:05 2022 +0100

    Merge pull request AvaloniaUI#8415 from AvaloniaUI/backport/8405

    Backport macOS windowing fixes.

commit af05fce
Author: Steven Kirk <[email protected]>
Date:   Tue Jun 28 10:35:34 2022 +0200

    Merge pull request AvaloniaUI#8232 from AvaloniaUI/feature/window-integration-tests

    Feature/window integration tests

commit 3b8499a
Author: Dan Walmsley <[email protected]>
Date:   Tue Jun 28 17:45:47 2022 +0100

    Merge pull request AvaloniaUI#8405 from AvaloniaUI/fixes/8335-more-macos-window-issues

    Fix more macos window issues and add more integration tests.

commit dcd3aa5
Author: Steven Kirk <[email protected]>
Date:   Wed Jun 29 15:49:23 2022 +0200

     Backport IntegrationTestApp to 0.10.x.

    Even though we don't have automation there and so can't do integration testing, it's still useful for manual testing.

commit 277d94c
Merge: 82d55a1 b446f21
Author: Max Katz <[email protected]>
Date:   Sun Jun 12 14:01:09 2022 -0400

    Merge pull request AvaloniaUI#8245 from Whiletru3/stable/0.10.x

    Use own Pen (if set) in GeometryDrawing.GetBounds

commit 82d55a1
Author: Dan Walmsley <[email protected]>
Date:   Fri Jun 10 09:46:05 2022 +0100

    Merge pull request AvaloniaUI#8305 from AvaloniaUI/fixes/reduce-excessive-layout-passes

    Fixes/reduce excessive layout passes
    # Conflicts:
    #	tests/Avalonia.Layout.UnitTests/LayoutManagerTests.cs

commit 96c21bf
Author: Dan Walmsley <[email protected]>
Date:   Wed Jun 8 13:03:02 2022 +0100

    Merge pull request AvaloniaUI#8270 from AvaloniaUI/feature/x11-xsync-counter

    [X11] Improve _NET_WM_SYNC_REQUEST handling

commit b446f21
Merge: 55101cd 4aedf52
Author: Whiletru3 <[email protected]>
Date:   Tue Jun 7 09:43:53 2022 +0200

    Merge branch 'AvaloniaUI:stable/0.10.x' into stable/0.10.x

commit 4aedf52
Author: Dan Walmsley <[email protected]>
Date:   Fri Jun 3 20:47:11 2022 +0100

    Merge pull request AvaloniaUI#8268 from AvaloniaUI/feature/x11-xsync-counter

    [X11] Added support for the basic version of _NET_WM_SYNC_REQUEST protocol

commit d666e4f
Merge: ab0c135 09c9a98
Author: Dan Walmsley <[email protected]>
Date:   Fri Jun 3 19:51:47 2022 +0100

    Merge pull request AvaloniaUI#8269 from AvaloniaUI/fixes/osx-setcontent-size-shadow-invalidation

    Fixes/osx setcontent size shadow invalidation

commit 09c9a98
Author: Dan Walmsley <[email protected]>
Date:   Fri Jun 3 19:46:52 2022 +0100

    only setcontentsize if window is shown or about to show.

commit 591b469
Author: Dan Walmsley <[email protected]>
Date:   Fri Jun 3 19:42:31 2022 +0100

    tidy nswindow initialisation.

commit ab0c135
Author: Dan Walmsley <[email protected]>
Date:   Fri Jun 3 17:24:57 2022 +0100

    Merge pull request AvaloniaUI#8267 from AvaloniaUI/fixes/osx-cef-electron-compatibility

    osx: restore missing api for cef - electron compatibility

commit 2bd9784
Author: Dan Walmsley <[email protected]>
Date:   Fri Jun 3 15:48:59 2022 +0100

    Merge pull request AvaloniaUI#8253 from AvaloniaUI/stop-iscancel-on-detached

    Stop listening for IsCancel on button detached

commit d18f979
Author: Dan Walmsley <[email protected]>
Date:   Fri Jun 3 15:48:34 2022 +0100

    Merge pull request AvaloniaUI#8252 from AvaloniaUI/safe-log-typed-adapter

    Check if BindingValue actually has a value before logging an error

commit 5d360fa
Author: Dan Walmsley <[email protected]>
Date:   Fri Jun 3 15:40:46 2022 +0100

    Merge pull request AvaloniaUI#8265 from AvaloniaUI/fixes/osx-invalidate-shadow-always

    whenever we become key... dispatch invalidateShadow

commit 6375103
Author: Dan Walmsley <[email protected]>
Date:   Fri Jun 3 15:20:52 2022 +0100

    Merge pull request AvaloniaUI#8264 from AvaloniaUI/fixes/osx-invalidate-shadow-onshow

    osx: ensure shadow is invalidated on show.

commit 55101cd
Merge: f733c0f 8499a55
Author: Whiletru3 <[email protected]>
Date:   Fri Jun 3 14:36:31 2022 +0200

    Merge branch 'AvaloniaUI:stable/0.10.x' into stable/0.10.x

commit 8499a55
Author: Dan Walmsley <[email protected]>
Date:   Fri Jun 3 12:22:43 2022 +0100

    Merge pull request AvaloniaUI#8258 from AvaloniaUI/fixes/osx-keyboard-input

    OSX: fix call to virtual method from ctor.

commit bd6d665
Author: Dan Walmsley <[email protected]>
Date:   Fri Jun 3 11:49:35 2022 +0100

    Merge pull request AvaloniaUI#8257 from AvaloniaUI/fixes/osx-toolbar-hint

    Fixes/osx toolbar hint

commit 4d99ad1
Author: Dan Walmsley <[email protected]>
Date:   Fri Jun 3 11:09:58 2022 +0100

    Merge pull request AvaloniaUI#8255 from AvaloniaUI/fixes/osx-extended-wants-chrome-hint

    OSX: fix logic for deciding if chrome buttons should be shown or not in ex…

commit f733c0f
Author: Patrick Tellier <[email protected]>
Date:   Fri Jun 3 12:42:42 2022 +0200

    Use own Pen (if set) in GeometryDrawing.GetBounds : Add unit tests

commit 603f543
Author: Dan Walmsley <[email protected]>
Date:   Thu Jun 2 23:03:31 2022 +0100

    osx: fix crash when modal dialog is opened over fullscreen parent.

commit d19ee54
Author: Dan Walmsley <[email protected]>
Date:   Thu Jun 2 18:55:09 2022 +0100

    Merge pull request AvaloniaUI#8249 from AvaloniaUI/fixes/osx-crash-on-main-window-close

    prevent segfault when closing app with child windows open.

commit 4f036d7
Merge: 651c4be 97a04c6
Author: Dan Walmsley <[email protected]>
Date:   Thu Jun 2 16:30:50 2022 +0100

    Merge pull request AvaloniaUI#8248 from AvaloniaUI/fixes/prevent-parent-resizing-when-modal-opened

    [OSX] dont allow disabled windows to resize.

commit 97a04c6
Author: Dan Walmsley <[email protected]>
Date:   Thu Jun 2 16:16:13 2022 +0100

    [OSX] dont allow disabled windows to resize.

commit 651c4be
Author: Max Katz <[email protected]>
Date:   Thu Jun 2 10:03:27 2022 -0400

    Merge pull request AvaloniaUI#8246 from AvaloniaUI/fixes/flyout-not-opening-more-than-once

    re-set popup.Parent if its no longer set.

commit 1f7cf04
Author: Patrick Tellier <[email protected]>
Date:   Thu Jun 2 14:10:20 2022 +0200

    Use own Pen (if set) in GeometryDrawing.GetBounds

commit 30e8b17
Merge: e907c91 e413b48
Author: Dan Walmsley <[email protected]>
Date:   Wed Jun 1 13:49:00 2022 +0100

    Merge pull request AvaloniaUI#8238 from AvaloniaUI/fixes/disable-parent-chrome-buttons-when-modal-is-shown

    OSX: Disable parent chrome buttons when modal is shown

commit e413b48
Merge: 0b109c1 e907c91
Author: Dan Walmsley <[email protected]>
Date:   Wed Jun 1 13:48:33 2022 +0100

    Merge remote-tracking branch 'origin/stable/0.10.x' into fixes/disable-parent-chrome-buttons-when-modal-is-shown

commit e907c91
Merge: 68c915e f9b8f20
Author: Dan Walmsley <[email protected]>
Date:   Wed Jun 1 13:47:56 2022 +0100

    Merge pull request AvaloniaUI#8239 from AvaloniaUI/fixes/osx-shadow-invalidation

    OSX Shadow invalidation when window sized

commit 0b109c1
Author: Dan Walmsley <[email protected]>
Date:   Wed Jun 1 13:42:32 2022 +0100

    controlcatalog can do dialog within dialog.

commit 4e9ed7f
Author: Dan Walmsley <[email protected]>
Date:   Wed Jun 1 13:34:27 2022 +0100

    use non hacky api to hide traffic lights.

commit dcc4dd8
Author: Dan Walmsley <[email protected]>
Date:   Wed Jun 1 13:34:14 2022 +0100

    disable chrome buttons when child modal is open.

commit f9b8f20
Author: Dan Walmsley <[email protected]>
Date:   Wed Jun 1 13:09:25 2022 +0100

    invalidate shadow on resize, and ordering.

commit 68c915e
Author: Dan Walmsley <[email protected]>
Date:   Wed Jun 1 12:03:41 2022 +0100

    Revert "Merge pull request AvaloniaUI#8189 from AvaloniaUI/fixes/8178-elementname-binding-leak"

    This reverts commit 20ed002.

commit aee14ba
Author: Dan Walmsley <[email protected]>
Date:   Wed Jun 1 11:46:00 2022 +0100

    fix missing using.

commit 761edc1
Author: Dan Walmsley <[email protected]>
Date:   Tue May 24 21:09:26 2022 +0100

    Merge pull request AvaloniaUI#8172 from AvaloniaUI/make-menu-selection-logic-consistant-with-other-frameworks

    Fix Menu selection to match UWP.
    # Conflicts:
    #	src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs

commit 7c1fc90
Author: Max Katz <[email protected]>
Date:   Sun May 15 19:49:04 2022 -0400

    Merge pull request AvaloniaUI#8141 from wieslawsoltes/fixes/FixPointerMovedEventNameRegistration

    Fix PointerMovedEvent name registration
    # Conflicts:
    #	tests/Avalonia.Base.UnitTests/Input/PointerOverTests.cs

commit 96c6f70
Author: Dan Walmsley <[email protected]>
Date:   Wed Jun 1 11:28:25 2022 +0100

    restore property rename.

commit 405f593
Author: Max Katz <[email protected]>
Date:   Fri May 13 14:15:52 2022 -0400

    Merge pull request AvaloniaUI#8126 from wieslawsoltes/fixes/FixTimePickerPropertyRegistrations

    Fix property owner type registrations
    # Conflicts:
    #	src/Avalonia.Controls/Primitives/SelectingItemsControl.cs

commit 9bcc5b6
Author: Max Katz <[email protected]>
Date:   Tue May 10 19:13:27 2022 -0400

    Merge pull request AvaloniaUI#8114 from wieslawsoltes/fixes/PropertyNames

    Fix property registrations
    # Conflicts:
    #	src/Avalonia.Controls/Presenters/TextPresenter.cs
    #	src/Avalonia.Controls/TextBox.cs

commit 6cce833
Author: Max Katz <[email protected]>
Date:   Tue May 10 15:29:15 2022 -0400

    Merge pull request AvaloniaUI#8115 from Kaktusbot/fix-missing-avalonialist-notifycountchanged

    Fix missing NotifyCountChanged in AvaloniaList.AddRange

commit 8251d79
Author: Steven Kirk <[email protected]>
Date:   Wed May 18 16:53:14 2022 +0200

    Merge pull request AvaloniaUI#8095 from sn4k3/master

    Respect Window MaxWidth and MaxHeight when using any SizeToContent to Auto

commit d2f3210
Author: Max Katz <[email protected]>
Date:   Mon Mar 21 00:44:56 2022 -0400

    Merge pull request AvaloniaUI#7786 from timunie/fix/DataGridCopyClearsContent

    Fix: DataGrid copying data clears DataGridCells

commit 10a0f6a
Author: Max Katz <[email protected]>
Date:   Thu May 12 15:32:18 2022 -0400

    Merge pull request AvaloniaUI#8119 from AvaloniaUI/feature/ireflectabletype

    Added support for IReflectableType in InpcPropertyAccessorPlugin

commit 81698eb
Author: Dan Walmsley <[email protected]>
Date:   Wed Jun 1 09:59:19 2022 +0100

    Merge pull request AvaloniaUI#8236 from AvaloniaUI/fix-popup-leak

    Fix FlyoutBase/ContextMenu memory leak

commit e27f8ab
Author: Dan Walmsley <[email protected]>
Date:   Tue May 31 17:07:57 2022 +0100

    Merge pull request AvaloniaUI#8233 from adirh3/upgrade_skia_packages

    Upgraded SkiaSharp packages
    # Conflicts:
    #	build/SkiaSharp.props

commit 20ed002
Author: Dariusz Komosiński <[email protected]>
Date:   Fri May 27 11:13:51 2022 +0200

    Merge pull request AvaloniaUI#8189 from AvaloniaUI/fixes/8178-elementname-binding-leak

    Make AvaloniaPropertyAccessorPlugin use weak events.

commit 9bd1e2a
Author: Dan Walmsley <[email protected]>
Date:   Wed Jun 1 11:03:07 2022 +0100

    Merge pull request AvaloniaUI#8211 from AvaloniaUI/fixes/osx-dialog-keep-on-top-when-deactivated

    [OSX] dialogs stay ontop of main window when another app is displayed.
    # Conflicts:
    #	native/Avalonia.Native/src/OSX/AvnView.mm
    #	native/Avalonia.Native/src/OSX/WindowBaseImpl.mm

commit 41d656b
Author: Max Katz <[email protected]>
Date:   Wed May 25 08:36:33 2022 -0400

    Merge pull request AvaloniaUI#8188 from AvaloniaUI/fixes/osx-dialog-titlebar-style

    Fix osx dialog style mask

commit 8095f04
Author: Dan Walmsley <[email protected]>
Date:   Wed May 25 21:05:11 2022 +0100

    Merge pull request AvaloniaUI#8187 from AvaloniaUI/fixes/save-file-dialog-filters-nullable

    OSX: fix file dialog filter nullable annotation, and osx platform.

commit 39ab03c
Author: Dan Walmsley <[email protected]>
Date:   Wed May 25 09:47:51 2022 +0100

    Revert "Merge pull request AvaloniaUI#7555 from AvaloniaUI/fixes/7552-visibility-layout-invalidation"

    This reverts commit 8a8deda.

commit a975408
Author: Benedikt Stebner <[email protected]>
Date:   Mon Mar 28 16:05:04 2022 +0200

    Merge pull request AvaloniaUI#7887 from ltetak/feature/skia_crash_on_exit

    Suppress static SKFont finalizer to prevent crashes on app exit

commit 8a8deda
Author: Max Katz <[email protected]>
Date:   Wed May 18 13:42:37 2022 -0400

    Merge pull request AvaloniaUI#7555 from AvaloniaUI/fixes/7552-visibility-layout-invalidation

    Fix visibility layout invalidation

commit 8ad1887
Author: Dan Walmsley <[email protected]>
Date:   Tue May 24 21:07:58 2022 +0100

    Merge pull request AvaloniaUI#8180 from AvaloniaUI/fixes/osx-popup-flyout-fixes

    Fixes/osx popup flyout fixes

commit 25384af
Merge: 0cad29b 6f22bd0
Author: Max Katz <[email protected]>
Date:   Mon May 23 20:07:33 2022 -0400

    Merge pull request AvaloniaUI#8157 from AvaloniaUI/fixes/menuscrollingvisibilityconverter-floating-point-compare

    Fix MenuScrollingVisibilityConverter floating point compare

commit 0cad29b
Merge: db20d69 55d8bd3
Author: Dan Walmsley <[email protected]>
Date:   Fri May 20 19:50:41 2022 +0100

    Merge pull request AvaloniaUI#8165 from AvaloniaUI/fixes/position-osx

    Fix more OSX regressions

commit 55d8bd3
Author: Dan Walmsley <[email protected]>
Date:   Thu May 19 13:24:51 2022 +0100

    popups shouldnt override Resize method.

commit c1dce5c
Author: Dan Walmsley <[email protected]>
Date:   Thu May 19 13:24:35 2022 +0100

    only center if window didnt get a position.

commit 24164ca
Author: Dan Walmsley <[email protected]>
Date:   Thu May 19 12:30:33 2022 +0100

    never return -1,-1 for position.

commit db20d69
Author: Max Katz <[email protected]>
Date:   Wed May 18 14:15:02 2022 -0400

    Merge pull request AvaloniaUI#8158 from AvaloniaUI/fixes/osx-nswindow-refactor-position

    [OSX] nswindow refactor - ensure position property is consistent before window is open.

commit f1053d1
Author: Dan Walmsley <[email protected]>
Date:   Wed May 18 13:43:46 2022 +0100

    Merge pull request AvaloniaUI#8154 from AvaloniaUI/fixes/osx-nswindow-refactor-fix-issues

commit 6f22bd0
Author: Steven Kirk <[email protected]>
Date:   Wed May 18 14:29:21 2022 +0200

    Fix comparison.

    Port of 747f33f (AvaloniaUI#8146) to stable branch.

commit 1c82eb4
Author: Dan Walmsley <[email protected]>
Date:   Tue May 10 21:50:54 2022 +0100

    fix sdk requirement.

commit 52b840a
Author: Dan Walmsley <[email protected]>
Date:   Tue May 10 17:54:59 2022 +0100

    fix unit tests.

commit 0054183
Author: Dan Walmsley <[email protected]>
Date:   Tue May 10 15:11:24 2022 +0100

    Merge pull request AvaloniaUI#8112 from AvaloniaUI/osx-nswindow-refactor-part4

    [OSX] cache IsClientAreaExtendedToDecorations, and apply it when NSPa…

commit 369ff63
Author: Dan Walmsley <[email protected]>
Date:   Tue May 10 14:25:57 2022 +0100

    relax sdk restrictions.

commit b3a2c79
Author: Max Katz <[email protected]>
Date:   Tue May 10 07:13:23 2022 -0400

    Merge pull request AvaloniaUI#8091 from AvaloniaUI/osx-nswindow-refactor-part3

    Osx nswindow refactor part3
    # Conflicts:
    #	native/Avalonia.Native/src/OSX/AvnView.mm
    #	native/Avalonia.Native/src/OSX/AvnWindow.mm
    #	native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
    #	native/Avalonia.Native/src/OSX/WindowImpl.mm
    #	native/Avalonia.Native/src/OSX/automation.h
    #	native/Avalonia.Native/src/OSX/automation.mm

commit 9d41fe9
Author: Dan Walmsley <[email protected]>
Date:   Tue May 10 11:55:11 2022 +0100

    Revert "Merge pull request AvaloniaUI#7963 from AvaloniaUI/disabled-items-should-not-be-selectable-with-keyboard"

    This reverts commit fa7294a.

commit 86d469a
Author: Dan Walmsley <[email protected]>
Date:   Sun May 8 19:18:09 2022 +0100

    Merge pull request AvaloniaUI#8089 from AvaloniaUI/fixes/min-size-titlebar-glitch

    OSX: use content min/max size for minsize.

commit 019b0fb
Author: Dan Walmsley <[email protected]>
Date:   Thu May 5 19:18:10 2022 +0100

    Merge pull request AvaloniaUI#8085 from AvaloniaUI/osx-nswindow-refactor-part2

    Osx nswindow refactor part2
    # Conflicts:
    #	native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
    #	native/Avalonia.Native/src/OSX/WindowImpl.mm
    #	native/Avalonia.Native/src/OSX/automation.mm
    #	native/Avalonia.Native/src/OSX/window.mm

commit 991d9d8
Author: Dan Walmsley <[email protected]>
Date:   Thu May 5 10:23:58 2022 +0100

    Merge pull request AvaloniaUI#8078 from AvaloniaUI/osx-nswindow-refactor

    Osx nswindow refactor: Part 1
    # Conflicts:
    #	native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj
    #	native/Avalonia.Native/src/OSX/automation.h
    #	native/Avalonia.Native/src/OSX/automation.mm
    #	native/Avalonia.Native/src/OSX/window.h
    #	native/Avalonia.Native/src/OSX/window.mm

commit 81e5fe8
Merge: fa7294a 4f3fa13
Author: Takoooooo <[email protected]>
Date:   Tue May 10 13:04:16 2022 +0300

    Merge branch 'stable/0.10.x' of https://github.com/AvaloniaUI/Avalonia into stable/0.10.x

commit fa7294a
Author: Takoooooo <[email protected]>
Date:   Tue May 10 13:03:59 2022 +0300

    Merge pull request AvaloniaUI#7963 from AvaloniaUI/disabled-items-should-not-be-selectable-with-keyboard

commit 4f3fa13
Author: Nikita Tsukanov <[email protected]>
Date:   Mon May 9 23:52:15 2022 +0300

    Make ThreadSafeObjectPool actually thread safe (AvaloniaUI#8106)

    * Make ThreadSafeObjectPool actually thread safe

commit 467ceb5
Author: Max Katz <[email protected]>
Date:   Thu May 5 12:11:29 2022 -0400

    Merge pull request AvaloniaUI#8083 from AvaloniaUI/feature/4886-expose-skia-currentopacity

    Expose CurrentOpacity on ISkiaDrawingContextImpl.

commit 46bf28a
Author: Tako <[email protected]>
Date:   Wed Apr 27 12:02:32 2022 +0300

    Merge pull request AvaloniaUI#8034 from AvaloniaUI/fix-contextMenu-freeze

    Fix ContextMenu freeze.
    # Conflicts:
    #	tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs

commit 4fab647
Author: Jumar Macato <[email protected]>
Date:   Thu Apr 14 05:08:13 2022 +0800

    Merge pull request AvaloniaUI#7968 from AvaloniaUI/feature/win32-gpu-blacklist

    add win32 egl gpu blacklist.

commit 0c2aa70
Author: Jumar Macato <[email protected]>
Date:   Mon Apr 4 22:10:23 2022 +0800

    Merge pull request AvaloniaUI#7921 from 0x0ade/fix-ellipsenode-transform

    Add missing context.Transform = Transform in EllipseNode

commit 806262b
Author: Jumar Macato <[email protected]>
Date:   Tue Mar 15 18:09:27 2022 +0800

    Merge pull request AvaloniaUI#7804 from ltetak/feature/mouse_over_events

    Invalid Mouse Over events on NC raw events

commit 1f9e7d0
Author: Max Katz <[email protected]>
Date:   Mon Mar 14 10:12:50 2022 -0400

    Merge pull request AvaloniaUI#7803 from AvaloniaUI/contextMenu-ignores-styles-on-first-open

    Fix "ContextMenu ignores styles on first open"

commit 3941eca
Author: Max Katz <[email protected]>
Date:   Sat Mar 12 09:15:35 2022 -0500

    Merge pull request AvaloniaUI#7792 from chylex/fix-fluent-textbox-disabled-foreground

    Fix wrong foreground TextBox color in Fluent theme

commit 71b5c83
Author: Max Katz <[email protected]>
Date:   Thu Apr 14 21:14:34 2022 -0400

    Merge pull request AvaloniaUI#7191 from ltetak/osx_handle_cmd_key_up

    OSX handle CMD+key up combinations in Avalonia

commit 60ebbb7
Author: Max Katz <[email protected]>
Date:   Tue Mar 22 21:17:56 2022 -0400

    Merge pull request AvaloniaUI#6991 from ltetak/osx_sound_defaultactions

    [OSX] Handle default dialog actions to prevent beeping sounds

commit 2980e94
Author: Max Katz <[email protected]>
Date:   Wed Apr 27 10:32:38 2022 +0100

    Merge pull request AvaloniaUI#6982 from rmbadmin/master

    fixes: TrayIcon should be re-added when the Explorer is restarted

commit 4dc6f60
Merge: 471aa28 f31f644
Author: Dan Walmsley <[email protected]>
Date:   Mon May 9 12:44:07 2022 +0100

    Merge pull request AvaloniaUI#8103 from AvaloniaUI/fixes/deterministic-builds

    Fixes/deterministic builds

commit f31f644
Author: Dan Walmsley <[email protected]>
Date:   Mon May 9 11:02:47 2022 +0100

    fix source of indeterminism in xaml compiler.

commit 471aa28
Merge: 851066c fa86e9b
Author: Max Katz <[email protected]>
Date:   Tue May 3 22:41:43 2022 +0100

    Merge pull request AvaloniaUI#8035 from AvaloniaUI/fixes/nullable-avalonia-native

    Fixes/nullable avalonia native

commit 851066c
Merge: c877c1b ede918e
Author: Benedikt Stebner <[email protected]>
Date:   Mon Apr 25 15:36:50 2022 +0200

    Merge pull request AvaloniaUI#8045 from Gillibald/fixes/stableSKTypefaceCollectionTests

    Fix SKTypefaceCollection tests

commit ede918e
Author: Benedikt Stebner <[email protected]>
Date:   Mon Apr 25 15:33:19 2022 +0200

    Fix SKTypefaceCollection tests

commit c877c1b
Author: Max Katz <[email protected]>
Date:   Sat Apr 2 18:13:20 2022 -0400

    Merge pull request AvaloniaUI#7911 from robloo/add-template-parts

    Add Template Part Attributes to Controls

commit 2ad6d64
Author: Jumar Macato <[email protected]>
Date:   Sun Mar 27 19:47:58 2022 +0800

    Merge pull request AvaloniaUI#7854 from robloo/template-part-attribute

    Implement TemplatePartAttribute from WPF

commit 76523e0
Author: Steven Kirk <[email protected]>
Date:   Sat Apr 9 20:23:07 2022 +0200

    Merge pull request AvaloniaUI#7954 from AvaloniaUI/fixes/7780-nativemenuitemseparator-exception

    Fix NativeMenuBar exception.

commit bad7e0a
Author: Max Katz <[email protected]>
Date:   Thu Apr 7 15:11:28 2022 -0400

    Merge pull request AvaloniaUI#7937 from AvaloniaUI/fixes/osx-reset-windowstate-when-dragged-in-maximised-state

    [OSX] reset maximised state when window is dragged.

commit 6f4f792
Author: Jumar Macato <[email protected]>
Date:   Fri Mar 11 15:02:14 2022 +0800

    Merge pull request AvaloniaUI#7774 from ahopper/fix-more-32bit-linux-session-manager-pinvokes

    fix pinvoke signature for smc and ice error handlers for 32 bit

commit fa86e9b
Merge: d06464d 4a90d96
Author: Dan Walmsley <[email protected]>
Date:   Fri Apr 22 16:15:26 2022 +0100

    Merge remote-tracking branch 'origin/stable/0.10.x' into fixes/nullable-avalonia-native

commit d06464d
Author: Dan Walmsley <[email protected]>
Date:   Fri Apr 22 16:15:08 2022 +0100

    nullable enable in avalonianative window / windowbase managed side.

commit 4a90d96
Merge: 0b859e8 22dd9cc
Author: Max Katz <[email protected]>
Date:   Fri Apr 15 22:42:52 2022 -0400

    Merge pull request AvaloniaUI#7930 from Gillibald/backports/relaxTypefaceResolution

    [0.10.x] Relax Typface resolution

commit 0b859e8
Author: Steven Kirk <[email protected]>
Date:   Tue Apr 12 09:38:25 2022 +0200

    Merge pull request AvaloniaUI#7964 from AvaloniaUI/fixes/7840-datetimepicker-touch-scroll

    Fix Date/Time picker touch scrolling

commit a888ca3
Author: Max Katz <[email protected]>
Date:   Sat Mar 19 23:44:05 2022 -0400

    Merge pull request AvaloniaUI#7834 from AvaloniaUI/fixes/touch-date-time-pickers

    fix using touch for date/time pickers.

commit 22dd9cc
Author: Benedikt Stebner <[email protected]>
Date:   Tue Apr 5 15:51:52 2022 +0200

    Fix GlyphTypeface loading

commit 7a9fe89
Author: Benedikt Stebner <[email protected]>
Date:   Tue Mar 29 17:27:20 2022 +0200

    Initial

commit 582389e
Author: Dan Walmsley <[email protected]>
Date:   Tue Mar 22 10:55:32 2022 +0000

    Merge pull request AvaloniaUI#7832 from AvaloniaUI/fixes/7815-overlaylayer-measure

    Measure overlay layer children to constraint.

commit 77eb149
Author: Dan Walmsley <[email protected]>
Date:   Fri Mar 11 16:50:18 2022 +0000

    Merge pull request AvaloniaUI#7788 from AvaloniaUI/fixes/mica-windows-11-fallback-check

    fix mica fallback check.

commit 9e12c24
Author: Dan Walmsley <[email protected]>
Date:   Tue Jan 4 18:33:12 2022 +0000

    Merge pull request AvaloniaUI#7310 from odalet/feature/fix-7309

    Fixes AvaloniaUI#7309 - Each time we retrieve a null *PlatformOptions from AvaloniaLocator, return a default instance
    # Conflicts:
    #	src/Avalonia.Native/AvaloniaNativeMenuExporter.cs

commit f0999fd
Author: Dan Walmsley <[email protected]>
Date:   Fri Mar 11 16:06:32 2022 +0000

    Merge pull request AvaloniaUI#7787 from AvaloniaUI/fixes/mica-acrylic-fallback-win32

    make mica fallback to acrylic on compatible windows 10

commit e84a13f
Author: Dan Walmsley <[email protected]>
Date:   Fri Mar 11 15:42:42 2022 +0000

    Merge pull request AvaloniaUI#7165 from MarchingCube/platform-screen-api

    Add more platform specific screen from Window/Rect/Point methods.
    # Conflicts:
    #	src/Avalonia.Controls/ApiCompatBaseline.txt
    #	src/Avalonia.Controls/Screens.cs

commit 160a560
Author: Dan Walmsley <[email protected]>
Date:   Thu Mar 10 16:45:25 2022 +0000

    Merge pull request AvaloniaUI#7775 from trympet/fix-dwm-opaque-backdrop

    Fix dwm opaque backdrop

commit 892960c
Author: Max Katz <[email protected]>
Date:   Wed Mar 2 14:18:06 2022 -0400

    Merge pull request AvaloniaUI#7736 from AvaloniaUI/fixes/mac-os-set-window-title-null

    allow setting the window title to null on osx.

commit d884847
Author: Dan Walmsley <[email protected]>
Date:   Wed Mar 2 16:48:43 2022 +0000

    Merge pull request AvaloniaUI#7723 from AvaloniaUI/fix-expander

    Fix expander header stretching

commit 2eb51b8
Author: Dan Walmsley <[email protected]>
Date:   Wed Mar 2 14:21:55 2022 +0000

    Merge pull request AvaloniaUI#7730 from AvaloniaUI/fixes/7582-centerowner-minimized

    Fall back from CenterOwner to CenterScreen when owner window is minimized.

commit 84f04f4
Author: Max Katz <[email protected]>
Date:   Sun Feb 20 14:31:19 2022 -0500

    Merge pull request AvaloniaUI#7660 from timunie/fix/AvaloniaUIgh-7636

    Add missing call to base class in ReactiveUserControl.OnDataContextChanged

commit 5b4f5da
Author: Max Katz <[email protected]>
Date:   Sun Feb 20 14:09:49 2022 -0500

    Merge pull request AvaloniaUI#7658 from trympet/7657-fix-brush-opacity-animation

    fix brush opacity animation

commit d535960
Author: Max Katz <[email protected]>
Date:   Fri Feb 18 20:18:16 2022 -0500

    Merge pull request AvaloniaUI#7645 from timunie/fix/CalendarDatePickerBindingMode

    Change default binding mode of SelectedDateProperty to TwoWay
    # Conflicts:
    #	src/Avalonia.Controls/Calendar/CalendarDatePicker.cs

commit 480dfdf
Author: Nikita Tsukanov <[email protected]>
Date:   Wed Dec 29 16:26:59 2021 +0300

    Merge pull request AvaloniaUI#7259 from AvaloniaUI/features/use-external-microcom-generator

    Use microcom generator from nuget
    # Conflicts:
    #	build/MicroCom.targets

commit 3f11b01
Author: Max Katz <[email protected]>
Date:   Wed Jan 26 15:21:00 2022 -0500

    Merge pull request AvaloniaUI#7440 from emmauss/diagnostic-key

    Ensure Control Inspection in Diagnostics tool window is triggered on Key Down

commit 870f62f
Author: Tako <[email protected]>
Date:   Sat Jan 29 17:35:18 2022 +0200

    Merge pull request AvaloniaUI#7449 from emmauss/fluent-compact

    Add DensityStyle property in Fluent Theme provider

commit 7d771c8
Author: Nikita Tsukanov <[email protected]>
Date:   Fri Jan 28 12:38:54 2022 +0300

    Merge pull request AvaloniaUI#7455 from Mikolaytis/DeadlockFix

    [Deadlock] Fix Monitor.Enter in finally

commit 859793b
Author: Max Katz <[email protected]>
Date:   Sun Jan 30 18:46:45 2022 -0500

    Merge pull request AvaloniaUI#7475 from wieslawsoltes/ViewboxPageXamlOnly

    [ControlCatalog] Set ComboBox items from xaml on ViewboxPage

commit 256bba5
Author: Max Katz <[email protected]>
Date:   Sun Jan 30 17:30:39 2022 -0500

    Merge pull request AvaloniaUI#7484 from wieslawsoltes/ClippingPageXamlOnly

    [RenderDemo] Set Border clip from xaml on ClippingPage

commit 039fa5b
Author: Max Katz <[email protected]>
Date:   Tue Feb 15 15:22:22 2022 -0500

    Merge pull request AvaloniaUI#7520 from timunie/fix/ScrollViewerShiftAndPointerWheel

    Fix [Shift] + [PointerWheel] should scroll horizontally

commit 2c53e06
Author: Olivier DALET <[email protected]>
Date:   Fri Feb 4 17:55:12 2022 +0100

    Fix AvaloniaUI#7519 - Reset fb and depth buffer Ids once they are deleted

commit 8bc795b
Author: Andrii Kurdiumov <[email protected]>
Date:   Sat Feb 5 17:51:15 2022 +0600

    Fix AOT incompatible code (AvaloniaUI#7534)

    * Fix AOT incompatible code
    Use code patterns which are AOT-friendly. That improves R2R and Native AOT scenarios

commit 7b44621
Author: Dan Walmsley <[email protected]>
Date:   Mon Feb 7 22:39:02 2022 +0000

    Merge pull request AvaloniaUI#7537 from fr-Pursuit/master

    Minimization bugfix on Windows

commit 80319bf
Author: Nikita Tsukanov <[email protected]>
Date:   Mon Feb 7 22:13:51 2022 +0300

    Merge pull request AvaloniaUI#7548 from ahopper/fix-32bit-linux-session-manger-pinvoke

    fix 32 bit raspberry pi session manager seg fault

commit e89b6dc
Author: Steve <[email protected]>
Date:   Tue Feb 8 20:30:48 2022 +0800

    Fix COM issue in Cursor (AvaloniaUI#7551)

    Bump S.D.Common to 6.0.0 for non-netstandard2.0 builds

commit 4dc4c99
Author: Dariusz Komosiński <[email protected]>
Date:   Wed Feb 9 14:41:07 2022 +0100

    Merge pull request AvaloniaUI#7569 from MarchingCube/win32-filepicker-no-exceptions

    Avoid using COM exceptions for dialog control flow.

commit 03bc5a4
Author: Max Katz <[email protected]>
Date:   Thu Feb 10 22:17:17 2022 -0500

    Merge pull request AvaloniaUI#7576 from pr8x/button-flyout-diagnostics

    DevTools: Enable inspection for Button.Flyout

commit bfff7d9
Author: Dan Walmsley <[email protected]>
Date:   Mon Feb 21 21:15:56 2022 +0000

    Merge pull request AvaloniaUI#7622 from pr8x/child-window-property2

    Exposing `Window.ChildWindows` collection

commit da3004d
Author: Dan Walmsley <[email protected]>
Date:   Wed Feb 16 22:24:27 2022 +0000

    Merge pull request AvaloniaUI#7628 from wieslawsoltes/UpdateNuGetPackageDescription

    Update PackageDescription for NuGet

commit 4b6d122
Author: Max Katz <[email protected]>
Date:   Thu Feb 17 10:22:03 2022 -0500

    Merge pull request AvaloniaUI#7634 from AvaloniaUI/fixes/7633-date-time-picker-popup

    Fix Date/Time picker popups
    # Conflicts:
    #	src/Avalonia.Controls/DateTimePickers/DatePicker.cs
    #	src/Avalonia.Controls/DateTimePickers/TimePicker.cs

commit 0419426
Merge: 645ce6a a9d683b
Author: Dan Walmsley <[email protected]>
Date:   Wed Feb 16 13:46:20 2022 +0000

    Merge branch 'stable/0.10.x' of https://github.com/AvaloniaUI/Avalonia into stable/0.10.x

commit 645ce6a
Author: Jumar Macato <[email protected]>
Date:   Wed Feb 16 21:42:16 2022 +0800

    Merge pull request AvaloniaUI#7611 from AvaloniaUI/feature/transitioning-content-control

    add transitioning content control.
    # Conflicts:
    #	src/Avalonia.Themes.Default/DefaultTheme.xaml
    #	src/Avalonia.Themes.Default/TransitioningContentControl.xaml

commit a9d683b
Author: Nikita Tsukanov <[email protected]>
Date:   Sat Feb 12 15:25:42 2022 +0300

    Introduced RawPointerPoint for usage with IntermediatePoints (AvaloniaUI#7581)

    Introduced RawPointerPoint for usage with IntermediatePoints

commit 8b3b654
Author: Max Katz <[email protected]>
Date:   Sun Jan 23 19:55:40 2022 -0500

    Merge pull request AvaloniaUI#7413 from AvaloniaUI/feature/intermediate-points

    Added GetIntermediatePoints support for X11, libinput and evdev
    # Conflicts:
    #	src/Avalonia.Base/Threading/JobRunner.cs

commit d22e627
Author: Dan Walmsley <[email protected]>
Date:   Tue Feb 15 17:45:22 2022 +0000

    Merge pull request AvaloniaUI#7605 from AvaloniaUI/feature/skia-layering-extensions

    Add Skia Helper Methods to allow applying Skia Filter Effects (Blur, DropShadow, Lighting) to DC content

# Conflicts:
#	build/SharedVersion.props
#	global.json
#	native/Avalonia.Native/src/OSX/window.mm
#	src/Avalonia.X11/X11Window.cs
#	src/Windows/Avalonia.Win32/Win32GlManager.cs
#	tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
  • Loading branch information
@donandren
donandren committed Jul 13, 2022
1 parent 4eead1b commit 1009305
Show file tree
Hide file tree
Showing 132 changed files with 4,933 additions and 390 deletions.
43 changes: 35 additions & 8 deletions Avalonia.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,15 +237,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsInteropTest", "sampl
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlSamples", "samples\SampleControls\ControlSamples.csproj", "{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTestApp", "samples\IntegrationTestApp\IntegrationTestApp.csproj", "{D3867680-B9C7-43D6-BF2C-697EC9CF1151}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Shared\RenderHelpers\RenderHelpers.projitems*{3c4c0cb4-0c0f-4450-a37b-148c84ff905f}*SharedItemsImports = 13
src\Shared\RenderHelpers\RenderHelpers.projitems*{3e908f67-5543-4879-a1dc-08eace79b3cd}*SharedItemsImports = 5
src\Shared\PlatformSupport\PlatformSupport.projitems*{7b92af71-6287-4693-9dcb-bd5b6e927e23}*SharedItemsImports = 5
src\Shared\RenderHelpers\RenderHelpers.projitems*{7d2d3083-71dd-4cc9-8907-39a0d86fb322}*SharedItemsImports = 5
src\Shared\PlatformSupport\PlatformSupport.projitems*{88060192-33d5-4932-b0f9-8bd2763e857d}*SharedItemsImports = 5
src\Shared\PlatformSupport\PlatformSupport.projitems*{e4d9629c-f168-4224-3f51-a5e482ffbc42}*SharedItemsImports = 13
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
Ad-Hoc|iPhone = Ad-Hoc|iPhone
Expand Down Expand Up @@ -2195,6 +2189,30 @@ Global
{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Release|iPhone.Build.0 = Release|Any CPU
{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.AppStore|iPhone.Build.0 = Debug|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.Debug|iPhone.Build.0 = Debug|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.Release|Any CPU.Build.0 = Release|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.Release|iPhone.ActiveCfg = Release|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.Release|iPhone.Build.0 = Release|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{D3867680-B9C7-43D6-BF2C-697EC9CF1151}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -2258,8 +2276,17 @@ Global
{C08E9894-AA92-426E-BF56-033E262CAD3E} = {9B9E3891-2366-4253-A952-D08BCEB71098}
{26A98DA1-D89D-4A95-8152-349F404DA2E2} = {A0CC0258-D18C-4AB3-854F-7101680FC3F9}
{A0D0A6A4-5C72-4ADA-9B27-621C7D94F270} = {9B9E3891-2366-4253-A952-D08BCEB71098}
{D3867680-B9C7-43D6-BF2C-697EC9CF1151} = {9B9E3891-2366-4253-A952-D08BCEB71098}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {87366D66-1391-4D90-8999-95A620AD786A}
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Shared\RenderHelpers\RenderHelpers.projitems*{3c4c0cb4-0c0f-4450-a37b-148c84ff905f}*SharedItemsImports = 13
src\Shared\RenderHelpers\RenderHelpers.projitems*{3e908f67-5543-4879-a1dc-08eace79b3cd}*SharedItemsImports = 5
src\Shared\PlatformSupport\PlatformSupport.projitems*{7b92af71-6287-4693-9dcb-bd5b6e927e23}*SharedItemsImports = 5
src\Shared\RenderHelpers\RenderHelpers.projitems*{7d2d3083-71dd-4cc9-8907-39a0d86fb322}*SharedItemsImports = 5
src\Shared\PlatformSupport\PlatformSupport.projitems*{88060192-33d5-4932-b0f9-8bd2763e857d}*SharedItemsImports = 5
src\Shared\PlatformSupport\PlatformSupport.projitems*{e4d9629c-f168-4224-3f51-a5e482ffbc42}*SharedItemsImports = 13
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion build/SharedVersion.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Product>Avalonia</Product>
<Version>0.10.14</Version>
<Version>0.10.16</Version>
<Copyright>Copyright 2022 &#169; The AvaloniaUI Project</Copyright>
<PackageProjectUrl>https://avaloniaui.net</PackageProjectUrl>
<RepositoryUrl>https://github.com/AvaloniaUI/Avalonia/</RepositoryUrl>
Expand Down
6 changes: 3 additions & 3 deletions build/SkiaSharp.props
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.178" />
<PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" Version="2.88.0-preview.178" />
<PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.0-preview.178"/>
<PackageReference Include="SkiaSharp" Version="2.88.1-preview.1" />
<PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" Version="2.88.1-preview.1" />
<PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.1-preview.1" />
</ItemGroup>
</Project>
18 changes: 9 additions & 9 deletions build/XUnit.props
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="xunit" Version="2.3.0" />
<PackageReference Include="xunit.abstractions" Version="2.0.1" />
<PackageReference Include="xunit.assert" Version="2.3.0" />
<PackageReference Include="xunit.core" Version="2.3.0" />
<PackageReference Include="xunit.extensibility.core" Version="2.3.0" />
<PackageReference Include="xunit.extensibility.execution" Version="2.3.0" />
<PackageReference Include="xunit.runner.console" Version="2.3.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
<PackageReference Include="Xunit.SkippableFact" Version="1.3.6" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
<PackageReference Include="xunit.assert" Version="2.4.1" />
<PackageReference Include="xunit.core" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.core" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
</ItemGroup>
<PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion global.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"sdk": {
"version": "6.0.100",
"version3": "3.1.416"
"version3": "3.1.416",
"rollForward": "latestFeature"
},
"msbuild-sdks": {
"Microsoft.Build.Traversal": "1.0.43",
Expand Down
5 changes: 5 additions & 0 deletions native/Avalonia.Native/inc/rendertarget.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#pragma once

#include "com.h"
#include "comimpl.h"
#include "avalonia-native.h"

@protocol IRenderTarget
-(void) setNewLayer: (CALayer*) layer;
Expand Down
17 changes: 17 additions & 0 deletions native/Avalonia.Native/src/OSX/AutoFitContentView.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//
// Created by Dan Walmsley on 05/05/2022.
// Copyright (c) 2022 Avalonia. All rights reserved.
//

#pragma once

#import <Foundation/Foundation.h>
#include "avalonia-native.h"

@interface AutoFitContentView : NSView
-(AutoFitContentView* _Nonnull) initWithContent: (NSView* _Nonnull) content;
-(void) ShowTitleBar: (bool) show;
-(void) SetTitleBarHeightHint: (double) height;

-(void) ShowBlur: (bool) show;
@end
106 changes: 106 additions & 0 deletions native/Avalonia.Native/src/OSX/AutoFitContentView.mm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
//
// Created by Dan Walmsley on 05/05/2022.
// Copyright (c) 2022 Avalonia. All rights reserved.
//

#include "AvnView.h"
#include "AutoFitContentView.h"
#include "WindowInterfaces.h"
#include "WindowProtocol.h"

@implementation AutoFitContentView
{
NSVisualEffectView* _titleBarMaterial;
NSBox* _titleBarUnderline;
NSView* _content;
NSVisualEffectView* _blurBehind;
double _titleBarHeightHint;
bool _settingSize;
}

-(AutoFitContentView* _Nonnull) initWithContent:(NSView *)content
{
_titleBarHeightHint = -1;
_content = content;
_settingSize = false;

[self setAutoresizesSubviews:true];
[self setWantsLayer:true];

_titleBarMaterial = [NSVisualEffectView new];
[_titleBarMaterial setBlendingMode:NSVisualEffectBlendingModeWithinWindow];
[_titleBarMaterial setMaterial:NSVisualEffectMaterialTitlebar];
[_titleBarMaterial setWantsLayer:true];
_titleBarMaterial.hidden = true;

_titleBarUnderline = [NSBox new];
_titleBarUnderline.boxType = NSBoxSeparator;
_titleBarUnderline.fillColor = [NSColor underPageBackgroundColor];
_titleBarUnderline.hidden = true;

[self addSubview:_titleBarMaterial];
[self addSubview:_titleBarUnderline];

_blurBehind = [NSVisualEffectView new];
[_blurBehind setBlendingMode:NSVisualEffectBlendingModeBehindWindow];
[_blurBehind setMaterial:NSVisualEffectMaterialLight];
[_blurBehind setWantsLayer:true];
_blurBehind.hidden = true;

[_blurBehind setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
[_content setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];

[self addSubview:_blurBehind];
[self addSubview:_content];

[self setWantsLayer:true];
return self;
}

-(void) ShowBlur:(bool)show
{
_blurBehind.hidden = !show;
}

-(void) ShowTitleBar: (bool) show
{
_titleBarMaterial.hidden = !show;
_titleBarUnderline.hidden = !show;
}

-(void) SetTitleBarHeightHint: (double) height
{
_titleBarHeightHint = height;

[self setFrameSize:self.frame.size];
}

-(void)setFrameSize:(NSSize)newSize
{
if(_settingSize)
{
return;
}

_settingSize = true;
[super setFrameSize:newSize];

auto window = (id <AvnWindowProtocol>) [self window];

// TODO get actual titlebar size

double height = _titleBarHeightHint == -1 ? [window getExtendedTitleBarHeight] : _titleBarHeightHint;

NSRect tbar;
tbar.origin.x = 0;
tbar.origin.y = newSize.height - height;
tbar.size.width = newSize.width;
tbar.size.height = height;

[_titleBarMaterial setFrame:tbar];
tbar.size.height = height < 1 ? 0 : 1;
[_titleBarUnderline setFrame:tbar];

_settingSize = false;
}
@end
Loading

0 comments on commit 1009305

Please sign in to comment.