zhusenlin/Semi.Avalonia
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/se/Semi.Avalonia synced 2026-04-05 08:46:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #536 from irihitech/517

Browse Source 
Fix actual Height
This commit is contained in:
Dong Bin
2025-01-19 17:12:12 +08:00
committed by GitHub
parent 7a4b18e14a a0ca9fa4d0
commit 8615783b61
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Semi.Avalonia/Controls/DatePicker.axaml
View File

@@ -169,7 +169,6 @@
<Grid
Name="PART_ButtonContentGrid"
Grid.Column="0"
VerticalAlignment="Center"
ColumnDefinitions="78*,Auto,132*,Auto,78*">
<TextBlock
Name="PART_DayTextBlock"
@@ -203,16 +202,12 @@
Name="PART_FirstSpacer"
Grid.Column="1"
Width="1"
Height="{TemplateBinding Height}"
MinHeight="{TemplateBinding MinHeight}"
HorizontalAlignment="Center"
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
<Rectangle
Name="PART_SecondSpacer"
Grid.Column="3"
Width="1"
Height="{TemplateBinding Height}"
MinHeight="{TemplateBinding MinHeight}"
HorizontalAlignment="Center"
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
</Grid>

6
src/Semi.Avalonia/Themes/Shared/Button.axaml
View File

@@ -1,9 +1,9 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<StaticResource x:Key="ButtonDefaultFontSize" ResourceKey="SemiFontSizeRegular" />
<StaticResource x:Key="ButtonDefaultFontWeight" ResourceKey="SemiFontWeightBold" />
<Thickness x:Key="ButtonDefaultPadding">12 6</Thickness>
<Thickness x:Key="ButtonLargePadding">16 10</Thickness>
<Thickness x:Key="ButtonSmallPadding">6 2</Thickness>
<Thickness x:Key="ButtonDefaultPadding">12 0</Thickness>
<Thickness x:Key="ButtonLargePadding">16 0</Thickness>
<Thickness x:Key="ButtonSmallPadding">6 0</Thickness>
<StaticResource x:Key="ButtonDefaultHeight" ResourceKey="SemiHeightControlDefault" />
<StaticResource x:Key="ButtonSmallHeight" ResourceKey="SemiHeightControlSmall" />
<StaticResource x:Key="ButtonLargeHeight" ResourceKey="SemiHeightControlLarge" />

4
src/Semi.Avalonia/Themes/Shared/Label.axaml
View File

@@ -1,7 +1,7 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<StaticResource x:Key="LabelTagBorderThickness" ResourceKey="SemiBorderThicknessControl" />
<Thickness x:Key="LabelTagSmallPadding">8 2</Thickness>
<Thickness x:Key="LabelTagLargePadding">8 4</Thickness>
<Thickness x:Key="LabelTagSmallPadding">8 0</Thickness>
<Thickness x:Key="LabelTagLargePadding">8 0</Thickness>
<x:Double x:Key="LabelTagSmallHeight">20</x:Double>
<x:Double x:Key="LabelTagLargeHeight">24</x:Double>
<StaticResource x:Key="LabelTagFontSize" ResourceKey="SemiFontSizeSmall" />