Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: Ensure clipping when corner radius is set #10672

Merged
merged 2 commits into from
Dec 7, 2022
Merged

fix: Ensure clipping when corner radius is set #10672

merged 2 commits into from
Dec 7, 2022

Conversation

MartinZikmund
Copy link
Member

@MartinZikmund MartinZikmund commented Dec 6, 2022 •
edited

GitHub Issue (If applicable): closes #10670, closes #10484

PR Type

What kind of change does this PR introduce?

What is the current behavior?

What is the new behavior?

PR Checklist

Please check if your PR fulfills the following requirements:

Other information

Internal Issue (If applicable):

@github-actions github-actions bot added the area/skia ✏️ Categorizes an issue or PR as relevant to Skia label Dec 6, 2022
@MartinZikmund
Copy link
Member Author

Will be adding runtime test for this

@MartinZikmund MartinZikmund marked this pull request as draft December 6, 2022 20:34
@MartinZikmund MartinZikmund marked this pull request as ready for review December 6, 2022 21:04
@nventive-devops
Copy link
Contributor

The build 63774 found UI Test snapshots differences: android-28-xamarin: 0, android-28-xamarin-Snap: 0, ios: 33, ios-Snap: 103, macOS-screenshots: 29, skia-gtk-screenshots: 158, skia-wpf-screenshots: 158, wasm: 24, wasm-automated-net7.0-Benchmarks: 0, wasm-automated-net7.0-Default: 6, wasm-automated-net7.0-RuntimeTests: 0

Details

  • android-28-xamarin: 0 changed over 0

  • android-28-xamarin-Snap: 0 changed over 0

  • ios: 33 changed over 291

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Check_CornerRadius_Border_CornerRadius=5
    • Keyboard_Textbox_NoScrollViewer_Validation_5_-_Remove_Focus_on_numberTextBox
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • Screenshots_Image_Stretch_Alignment_Equal_Mode-0
    • Screenshots_Image_Stretch_Alignment_Wider_Mode-1
    • Screenshots_Image_Stretch_Alignment_Wider_Mode-2
    • Screenshots_Image_Stretch_Alignment_Wider_Mode-3
    • TextBox_BeforeTextChanging_UITests_Shared_Windows_UI_Xaml_Controls_TextBoxTests_TextBox_BeforeTextChanging
    • Check_CornerRadius_Border_UITests_Shared_Windows_UI_Xaml_Controls_BorderTests_Border_CornerRadius_Toggle
    • DatePicker_Flyout_DatePicker_-_Flyout
    • Keyboard_Textbox_NoScrollViewer_Validation_0_-_Remove_Focus_on_normalTextBox
    • Keyboard_Textbox_NoScrollViewer_Validation_4_-_Remove_Focus_on_multilineTextBox
    • Check_CornerRadius_Border_No_CornerRadius
    • ContentPresenter_Template_Uno_UI_Samples_Content_UITests_ContentPresenter_ContentPresenter_Template
    • Keyboard_Textbox_NoScrollViewer_Validation_1_-_Remove_Focus_on_filledTextBox
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • Screenshots_Image_Stretch_Alignment_Equal_Mode-1
    • Screenshots_Image_Stretch_Alignment_Equal_Mode-2
    • Screenshots_Image_Stretch_Alignment_Equal_Mode-3
    • Screenshots_Image_Stretch_Alignment_Wider_Mode-0

  • ios-Snap: 103 changed over 1005

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ComboBox_ComboBox_Disabled_UITests_Windows_UI_Xaml_Controls_ComboBox_ComboBox_Disabled
    • ComboBox_ComboBox_NativePopup_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ComboBox_ComboBox_NativePopup
    • ComboBox_ComboBox_NoDataContext_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_NoDataContext
    • ComboBox_ComboBox_Picker_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ComboBox_ComboBox_Picker
    • CommandBar_CommandBar_Xaml_Automated_UITests_Shared_Windows_UI_Xaml_Controls_CommandBar_CommandBar_Xaml_Automated
    • Border_BorderRightwithmargins_Uno_UI_Samples_UITests_BorderTestsControl_BorderRightwithmargins
    • Border_BorderTopwithmargins_Uno_UI_Samples_UITests_BorderTestsControl_BorderTopwithmargins
    • Border_Uno_UI_Samples_UITests_BorderTestsControl_Border_BorderThickness_Uno_UI_Samples_UITests_BorderTestsControl_Border_BorderThickness
    • Clipping_SamplesApp_Windows_UI_Xaml_Clipping_XamlButtonWithClipping_SamplesApp_Windows_UI_Xaml_Clipping_XamlButtonWithClipping
    • ComboBox_ComboBox_MaxDropdownHeight_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_MaxDropdownHeight
    • Border_BorderLeftwithmargins_Uno_UI_Samples_UITests_BorderTestsControl_BorderLeftwithmargins
    • Border_Border_Corner_Overlap_UITests_Shared_Windows_UI_Xaml_Controls_BorderTests_Border_CornerOverlap
    • Clipping_UITests_Shared_Windows_UI_Xaml_Clipping_ClippingRoundedCorners_UITests_Shared_Windows_UI_Xaml_Clipping_ClippingRoundedCorners
    • Clipping_UITests_Shared_Windows_UI_Xaml_Clipping_ClippingToControlBounds_UITests_Shared_Windows_UI_Xaml_Clipping_ClippingToControlBounds
    • Default_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation
    • ComboBox_ComboBox_SelectedIndex_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_SelectedIndex
    • Default_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListView_ProportionalPanel_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListView_ProportionalPanel
    • FrameworkElement_UITests_Shared_Windows_UI_Xaml_FrameworkElementTests_FrameworkElement_NativeLayout_UITests_Shared_Windows_UI_Xaml_FrameworkElementTests_FrameworkElement_NativeLayout
    • Gesture_Recognizer_UITests_Shared_Windows_UI_Input_GestureRecognizerTests_GestureEventsCommons_UITests_Shared_Windows_UI_Input_GestureRecognizerTests_GestureEventsCommons
    • Gesture_Recognizer_UITests_Shared_Windows_UI_Input_GestureRecognizerTests_TransformationsHoverSibling_UITests_Shared_Windows_UI_Input_GestureRecognizerTests_TransformationsHoverSibling

  • macOS-screenshots: 29 changed over 1083

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Image-ImageSourceUrlMsAppDataScheme.png
    • Image-Image_Stretch_Alignment_Bigger.png
    • Image-Image_Stretch_Alignment_SizeOnControl.png
    • Image-Image_Stretch_Alignment_Smaller.png
    • Image-Image_Stretch_Full_Taller.png
    • Image-Image_Formats.png
    • ListView-ListView_Weird_Measure.png
    • MediaPlayerElement-Using .3gp.png
    • MediaPlayerElement-Using .flv.png
    • MediaPlayerElement-Using .mkv.png
    • MediaPlayerElement-Using .ogg.png
    • NavigationView-NavigationViewCustomThemeResourcesPage.png
    • NavigationView-NavigationViewPage.png
    • NavigationView-NavigationViewRS4Page.png
    • NavigationView-NavigationViewSample.png
    • MUX-NavigationViewCustomThemeResourcesPage.png
    • MUX-NavigationViewPage.png
    • MUX-NavigationViewRS3Page.png
    • MUX-NavigationViewRS4Page.png
    • MUX-NavigationViewTopNavPage.png

  • skia-gtk-screenshots: 158 changed over 1072

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Border-Border_CornerRadius_Binding.png
    • Border-Border_CornerRadius_BorderThickness.png
    • Border-OnepxThicknessandRadiusAndTextBlock.png
    • Border-SimplewithNonUnifmormRadius.png
    • Brushes-GradientsPage.png
    • Brushes-ImageBrushAlignmentXY.png
    • Canvas-Canvas_ZIndex.png
    • Border-Border_AntiAlias.png
    • Border-Border_CornerRadius_Clipping.png
    • Border-Border_CornerRadius_Gradient.png
    • Border-Border_Corner_Overlap.png
    • Border-Border_LinearGradientBrush.png
    • Border-NonUniformThicknessandRadius.png
    • Border-OnepxThicknessandRadius.png
    • Border-Simple_with_Radius.png
    • Border-UniformThicknessandNonUniformRadius.png
    • Brushes-BorderImageBrush.png
    • Brushes-ImageBrush_StreamSource.png
    • CommandBar-CommandBar_Native_With_TextBox.png
    • Border-Border_Clipped_Change_Property.png

  • skia-wpf-screenshots: 158 changed over 1072

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Border-Border_AntiAlias.png
    • Border-Border_CornerRadius_Binding.png
    • Border-Border_CornerRadius_BorderThickness.png
    • Border-Border_Corner_Overlap.png
    • Border-Border_LinearGradientBrush.png
    • Border-Circle.png
    • Border-Simple_with_Radius.png
    • Border-UniformThicknessandNonUniformRadius.png
    • Brushes-Ellipse.png
    • Brushes-GradientsPage.png
    • Brushes-ImageBrushAlignmentXY.png
    • Brushes-ImageBrushChangingCornerRadius.png
    • Brushes-ImageBrush_StreamSource.png
    • Brushes-RevealBrush_Fallback.png
    • Brushes-SolidColorBrush_Color_Changed.png
    • Canvas-Canvas_ZIndex.png
    • Clipping-ClippingRoundedCorners.png
    • Clipping-CornerRadiusControls.png
    • Border-Border_Clipped_Change_Property.png
    • Border-Border_CornerRadius_Clipping.png

  • wasm: 24 changed over 1013

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • SamplesApp.Samples.NavigationViewSample.NavigationViewSample
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ListView.ListView_IsSelected
    • MUXControlsTestApp.NavigationViewMenuItemStretchPage
    • MUXControlsTestApp.NavigationViewRS4Page
    • MUXControlsTestApp.PersonPicturePage
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRing_Features
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRingPage
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRing_CustomSources
    • UITests.Shared.Windows_Devices.Midi.MidiDeviceEnumerationTests
    • UITests.Shared.Windows_UI_Xaml_Automation.AutomationProperties_Name
    • UITests.Shared.Windows_UI_Xaml_Controls.ListView.ListView_TransformsOnList
    • UITests.Shared.Windows_UI_Xaml_Controls.NavigationViewTests.NavigationView_TopNavigation
    • UITests.Microsoft_UI_Xaml_Controls.TabViewTests.TabViewPage
    • UITests.Shared.Microsoft_UI_Xaml_Controls.ColorPickerTests.WinUIColorPickerPage
    • UITests.Shared.Windows_UI_Xaml_Controls.ListView.ListView_Explicit_Items
    • UITests.Windows_UI_Xaml_Controls.ProgressRing.WindowsProgressRing_GH1220
    • UITests.Uno_Web.Http.CookieManagerTests
    • UITests.Windows_UI_Xaml_Controls.CalendarView.CalendarView_Theming
    • UITests.Windows_UI_Xaml_Controls.ListView.ListView_Selection_Pointers
    • UITests.Windows_UI_ViewManagement.ApplicationViewSizing

  • wasm-automated-net7.0-Benchmarks: 0 changed over 1

  • wasm-automated-net7.0-Default: 6 changed over 887

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • MinMaxTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • ImageStretch_None_Uno_UI_Samples_UITests_ImageTestsControl_Image_Stretch_None
    • NativeCommandBar_Size_Uno_UI_Samples_Content_UITests_CommandBar_CommandBar_Dynamic
    • TestProgressRing_InitialState_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features
    • When_Theme_Changed_No_Crash_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming

  • wasm-automated-net7.0-RuntimeTests: 0 changed over 1

@MartinZikmund MartinZikmund merged commit 29d0e1b into master Dec 7, 2022
@MartinZikmund MartinZikmund deleted the dev/mazi/skia-clipping branch December 7, 2022 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeromelaban jeromelaban jeromelaban approved these changes

Assignees
No one assigned
Labels
area/skia ✏️ Categorizes an issue or PR as relevant to Skia
Projects
None yet
Milestone
No milestone
3 participants
@MartinZikmund @nventive-devops @jeromelaban