Skip to content

fix: Uno Platform - Avoid square border around RangeSelector Thumbs #400

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

Merged
Arlodotexe merged 5 commits into from
May 18, 2024
Merged

fix: Uno Platform - Avoid square border around RangeSelector Thumbs #400

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a303690
fix: Avoid square border around RangeSelector Thumbs
MartinZikmund Apr 12, 2024
9b44a69
chore: Apply styling
MartinZikmund Apr 18, 2024
a2f6ab6
chore: Adjust not_win usage
MartinZikmund Apr 26, 2024
0925c06
chore: Styling
MartinZikmund Apr 28, 2024
b8f5d36
Merge branch 'main' into dev/mazi/square-thumbs
Arlodotexe May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions components/RangeSelector/src/RangeSelector.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="using:CommunityToolkit.WinUI.Controls">
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:not_win="http://uno.ui/not_win"
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
mc:Ignorable="not_win">

<Style BasedOn="{StaticResource DefaultRangeSelectorStyle}"
TargetType="controls:RangeSelector" />
Expand All @@ -25,6 +29,11 @@
TargetType="Thumb">
<Setter Property="UseSystemFocusVisuals" Value="True" />
<Setter Property="BorderThickness" Value="1" />
<win:Setter Property="BorderBrush"
Value="{ThemeResource SliderThumbBorderBrush}" />
<!-- Uno specific (https://github.com/unoplatform/uno/issues/6457): Use solid border brush -->
<not_win:Setter Property="BorderBrush"
Value="{ThemeResource ControlStrokeColorDefaultBrush}" />
<Setter Property="Background" Value="{ThemeResource SliderThumbBackground}" />
<Setter Property="Height" Value="{ThemeResource SliderHorizontalThumbHeight}" />
<Setter Property="Width" Value="{ThemeResource SliderHorizontalThumbWidth}" />
Expand All @@ -35,7 +44,7 @@
<ControlTemplate TargetType="Thumb">
<Border Margin="-2"
Background="{ThemeResource SliderOuterThumbBackground}"
BorderBrush="{ThemeResource SliderThumbBorderBrush}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}">
<VisualStateManager.VisualStateGroups>
Expand Down