Merge pull request #229 from irihitech/header
fix: delete default height and width, fix RowDefinitions.
This commit is contained in:
commit
00130d6cf7
@ -6,7 +6,7 @@
|
|||||||
x:Class="Semi.Avalonia.Demo.Pages.HeaderedContentControlDemo">
|
x:Class="Semi.Avalonia.Demo.Pages.HeaderedContentControlDemo">
|
||||||
<ScrollViewer>
|
<ScrollViewer>
|
||||||
<StackPanel HorizontalAlignment="Left" Spacing="20">
|
<StackPanel HorizontalAlignment="Left" Spacing="20">
|
||||||
<HeaderedContentControl Theme="{DynamicResource GroupBox}" Header="Semi Design">
|
<HeaderedContentControl Theme="{DynamicResource GroupBox}" Header="Semi Design" Width="400" Height="200">
|
||||||
<TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统。设计系统包含设计语言以及一整套可复用的前端组件,帮助设计师与开发者更容易地打造高质量的、用户体验一致的、符合设计规范的 Web 应用。</TextBlock>
|
<TextBlock TextWrapping="Wrap">Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统。设计系统包含设计语言以及一整套可复用的前端组件,帮助设计师与开发者更容易地打造高质量的、用户体验一致的、符合设计规范的 Web 应用。</TextBlock>
|
||||||
</HeaderedContentControl>
|
</HeaderedContentControl>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
</Style>
|
</Style>
|
||||||
</StackPanel.Styles>
|
</StackPanel.Styles>
|
||||||
<HeaderedContentControl
|
<HeaderedContentControl
|
||||||
|
Width="400"
|
||||||
Height="400"
|
Height="400"
|
||||||
Margin="16"
|
Margin="16"
|
||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
@ -94,6 +95,7 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
</HeaderedContentControl>
|
</HeaderedContentControl>
|
||||||
<HeaderedContentControl
|
<HeaderedContentControl
|
||||||
|
Width="400"
|
||||||
Height="400"
|
Height="400"
|
||||||
Margin="16"
|
Margin="16"
|
||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
</Style>
|
</Style>
|
||||||
</StackPanel.Styles>
|
</StackPanel.Styles>
|
||||||
<HeaderedContentControl
|
<HeaderedContentControl
|
||||||
|
Width="400"
|
||||||
Height="400"
|
Height="400"
|
||||||
Margin="16"
|
Margin="16"
|
||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
@ -95,6 +96,7 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
</HeaderedContentControl>
|
</HeaderedContentControl>
|
||||||
<HeaderedContentControl
|
<HeaderedContentControl
|
||||||
|
Width="400"
|
||||||
Height="400"
|
Height="400"
|
||||||
Margin="16"
|
Margin="16"
|
||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
|
@ -7,8 +7,6 @@
|
|||||||
<Setter Property="BorderThickness" Value="1" />
|
<Setter Property="BorderThickness" Value="1" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource HeaderedContentControlDefaultBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource HeaderedContentControlDefaultBorderBrush}" />
|
||||||
<Setter Property="CornerRadius" Value="{DynamicResource HeaderedContentControlCornerRadius}" />
|
<Setter Property="CornerRadius" Value="{DynamicResource HeaderedContentControlCornerRadius}" />
|
||||||
<Setter Property="Width" Value="400" />
|
|
||||||
<Setter Property="Height" Value="200" />
|
|
||||||
<Setter Property="HorizontalAlignment" Value="Stretch" />
|
<Setter Property="HorizontalAlignment" Value="Stretch" />
|
||||||
<Setter Property="HorizontalContentAlignment" Value="Left" />
|
<Setter Property="HorizontalContentAlignment" Value="Left" />
|
||||||
<Setter Property="VerticalContentAlignment" Value="Stretch" />
|
<Setter Property="VerticalContentAlignment" Value="Stretch" />
|
||||||
@ -23,7 +21,7 @@
|
|||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
CornerRadius="{TemplateBinding CornerRadius}"
|
CornerRadius="{TemplateBinding CornerRadius}"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}">
|
BorderThickness="{TemplateBinding BorderThickness}">
|
||||||
<Grid RowDefinitions="Auto,Auto,*">
|
<Grid RowDefinitions="Auto,Auto,Auto">
|
||||||
<ContentPresenter
|
<ContentPresenter
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
FontWeight="Bold"
|
FontWeight="Bold"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user