Skip to content

Commit 9fe3415

Browse files
robloomaxkatz6
andauthored
ColorPicker Simple Theme Fixes (#16654)
* Disable vertical scrolling in Simple theme NumericUpDown * Improve color picker simple themes * VerticalContentAlignment --------- Co-authored-by: Max Katz <[email protected]>
1 parent 335894c commit 9fe3415

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorPicker.xaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@
103103
<TabItem Theme="{StaticResource ColorViewTabItemTheme}"
104104
IsVisible="{TemplateBinding IsColorSpectrumVisible}">
105105
<TabItem.Header>
106-
<Border Height="{DynamicResource ColorViewTabStripHeight}">
106+
<Border Height="{DynamicResource ColorViewTabStripHeight}"
107+
Background="Transparent">
107108
<PathIcon Width="20"
108109
Height="20"
109110
Data="{DynamicResource ColorViewSpectrumIconGeometry}" />
@@ -168,7 +169,8 @@
168169
<TabItem Theme="{StaticResource ColorViewTabItemTheme}"
169170
IsVisible="{TemplateBinding IsColorPaletteVisible}">
170171
<TabItem.Header>
171-
<Border Height="{DynamicResource ColorViewTabStripHeight}">
172+
<Border Height="{DynamicResource ColorViewTabStripHeight}"
173+
Background="Transparent">
172174
<PathIcon Width="20"
173175
Height="20"
174176
Data="{DynamicResource ColorViewPaletteIconGeometry}" />
@@ -203,7 +205,8 @@
203205
<TabItem Theme="{StaticResource ColorViewTabItemTheme}"
204206
IsVisible="{TemplateBinding IsColorComponentsVisible}">
205207
<TabItem.Header>
206-
<Border Height="{DynamicResource ColorViewTabStripHeight}">
208+
<Border Height="{DynamicResource ColorViewTabStripHeight}"
209+
Background="Transparent">
207210
<PathIcon Width="20"
208211
Height="20"
209212
Data="{DynamicResource ColorViewComponentsIconGeometry}" />
@@ -264,6 +267,8 @@
264267
AutomationProperties.Name="Hexadecimal Color"
265268
Height="32"
266269
MaxLength="9"
270+
Padding="10,6,6,5"
271+
VerticalContentAlignment="Center"
267272
HorizontalAlignment="Stretch"
268273
CornerRadius="0,0,0,0" />
269274
</Grid>

src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,8 @@
306306
<TabItem Theme="{StaticResource ColorViewTabItemTheme}"
307307
IsVisible="{TemplateBinding IsColorSpectrumVisible}">
308308
<TabItem.Header>
309-
<Border Height="{DynamicResource ColorViewTabStripHeight}">
309+
<Border Height="{DynamicResource ColorViewTabStripHeight}"
310+
Background="Transparent">
310311
<PathIcon Width="20"
311312
Height="20"
312313
Data="{DynamicResource ColorViewSpectrumIconGeometry}" />
@@ -371,7 +372,8 @@
371372
<TabItem Theme="{StaticResource ColorViewTabItemTheme}"
372373
IsVisible="{TemplateBinding IsColorPaletteVisible}">
373374
<TabItem.Header>
374-
<Border Height="{DynamicResource ColorViewTabStripHeight}">
375+
<Border Height="{DynamicResource ColorViewTabStripHeight}"
376+
Background="Transparent">
375377
<PathIcon Width="20"
376378
Height="20"
377379
Data="{DynamicResource ColorViewPaletteIconGeometry}" />
@@ -406,7 +408,8 @@
406408
<TabItem Theme="{StaticResource ColorViewTabItemTheme}"
407409
IsVisible="{TemplateBinding IsColorComponentsVisible}">
408410
<TabItem.Header>
409-
<Border Height="{DynamicResource ColorViewTabStripHeight}">
411+
<Border Height="{DynamicResource ColorViewTabStripHeight}"
412+
Background="Transparent">
410413
<PathIcon Width="20"
411414
Height="20"
412415
Data="{DynamicResource ColorViewComponentsIconGeometry}" />
@@ -467,6 +470,8 @@
467470
AutomationProperties.Name="Hexadecimal Color"
468471
Height="32"
469472
MaxLength="9"
473+
Padding="10,6,6,5"
474+
VerticalContentAlignment="Center"
470475
HorizontalAlignment="Stretch"
471476
CornerRadius="0,0,0,0" />
472477
</Grid>

src/Avalonia.Themes.Simple/Controls/NumericUpDown.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
HorizontalContentAlignment="Stretch"
1515
VerticalContentAlignment="Stretch"
1616
IsTabStop="False"
17+
Padding="0"
18+
MinWidth="0"
1719
AllowSpin="{TemplateBinding AllowSpin}"
1820
Background="{TemplateBinding Background}"
1921
BorderBrush="{TemplateBinding BorderBrush}"
@@ -25,6 +27,7 @@
2527
MinWidth="20"
2628
Margin="4"
2729
Padding="{TemplateBinding Padding}"
30+
ScrollViewer.VerticalScrollBarVisibility="Disabled"
2831
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
2932
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
3033
AcceptsReturn="False"

0 commit comments

Comments
 (0)