Avalonia

Branch: android_naot

Commit Graph

Author	SHA1	Message	Date
robloo	2a9e7e9dcf	Add BackgroundSizing (#14048 ) * Add BackgroundSizing enum * Improve formatting in RoundedRect * Add the BackgroundSizing property to relevant controls * Add new GeometryBuilder helper This is based on new ideas and APIs in both WinUI and WPF * Support BackgroundSizing in BorderRenderHelper This also removes the last remnants of dash array support in the internal APIs * Remove old code in BorderRenderHelper moved to GeometryBuilder * Move Rectangle shape geometry calculation into GeometryBuilder * Add RadiusX/Y properties to RectangleGeometry * Use RectangleGeometry directly in the Rectangle shape Since RectangleGeometry now supports RadiusX/Y there is no longer a need to have a separate geometry creation path. * Add WinUI-based CalculateRoundedCornersRectangle() method * Simplify and use the WinUI-algorithm in BorderRenderHelper * Update GeometryBuilder.DrawRoundedCornersRectangle() based on WinUI * Remove obsolete WPF-based CalculateRoundedCornersRectangle method * Update CalculateRoundedCornersRectangleAlternate * Update GeometryBuilderTests * Fix merge * Remove unused dashed line properties in BorderRenderHelper These were already removed in master but could not be merged directly because of the new backgroundSizing parameter. * Optimize CalculateRoundedCornersRectangle In the worse-case up to three Point structs were created during calculation for each keypoint. Now doubles are used during calculations so the Point is created once at the end. * Adjust corner radius calculation within custom GeometryBuilder.CalculateRoundedCornersRectangle() Corner radius is defined at the center of the border stroke rather than the outside edge. * Simplify code in WinUI's algorithm for CalculateRoundedCornersRectangle() * Remove extra BorderRenderHelper.RenderCore method This method does not need to be separate from Render. * Add more CalculateRoundedCornersRectangle tests and adjust method naming * Remove custom CalculateRoundedCornersRectangle() algorithm and always use the WinUI one * Remove some AggressiveInlining attributes * Make parameters clear * Pass RoundedRectKeypoints by ref * Use GeometryCombineMode.Exclude to better calculate border geometries * Update BorderPage.xaml to include BackgroundSizing API --------- Co-authored-by: Max Katz <maxkatz6@outlook.com>	3 years ago

Author

SHA1

Message

Date

robloo

2a9e7e9dcf

Add BackgroundSizing (#14048 )

* Add BackgroundSizing enum

* Improve formatting in RoundedRect

* Add the BackgroundSizing property to relevant controls

* Add new GeometryBuilder helper

This is based on new ideas and APIs in both WinUI and WPF

* Support BackgroundSizing in BorderRenderHelper

This also removes the last remnants of dash array support in the internal APIs

* Remove old code in BorderRenderHelper moved to GeometryBuilder

* Move Rectangle shape geometry calculation into GeometryBuilder

* Add RadiusX/Y properties to RectangleGeometry

* Use RectangleGeometry directly in the Rectangle shape

Since RectangleGeometry now supports RadiusX/Y there is no longer a need to have a separate geometry creation path.

* Add WinUI-based CalculateRoundedCornersRectangle() method

* Simplify and use the WinUI-algorithm in BorderRenderHelper

* Update GeometryBuilder.DrawRoundedCornersRectangle() based on WinUI

* Remove obsolete WPF-based CalculateRoundedCornersRectangle method

* Update CalculateRoundedCornersRectangleAlternate

* Update GeometryBuilderTests

* Fix merge

* Remove unused dashed line properties in BorderRenderHelper

These were already removed in master but could not be merged directly because of the new backgroundSizing parameter.

* Optimize CalculateRoundedCornersRectangle

In the worse-case up to three Point structs were created during calculation for each keypoint. Now doubles are used during calculations so the Point is created once at the end.

* Adjust corner radius calculation within custom GeometryBuilder.CalculateRoundedCornersRectangle()

Corner radius is defined at the center of the border stroke rather than the outside edge.

* Simplify code in WinUI's algorithm for CalculateRoundedCornersRectangle()

* Remove extra BorderRenderHelper.RenderCore method

This method does not need to be separate from Render.

* Add more CalculateRoundedCornersRectangle tests and adjust method naming

* Remove custom CalculateRoundedCornersRectangle() algorithm and always use the WinUI one

* Remove some AggressiveInlining attributes

* Make parameters clear

* Pass RoundedRectKeypoints by ref

* Use GeometryCombineMode.Exclude to better calculate border geometries

* Update BorderPage.xaml to include BackgroundSizing API

---------

Co-authored-by: Max Katz <maxkatz6@outlook.com>

3 years ago

1 Commits (android_naot)