chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #615 from irihitech/dialog

Browse Source 
Dialog/Drawer: Make ScrollBarVisibility a parent property
This commit is contained in:
Zhang Dian
2025-03-20 15:49:04 +08:00
committed by GitHub
parent b55db2a758 c956734475
commit 261e0ec50f
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Ursa.Themes.Semi/Controls/Dialog.axaml
View File

@@ -17,6 +17,8 @@
<TransformOperationsTransition Property="RenderTransform" Duration="0.2" /> <TransformOperationsTransition Property="RenderTransform" Duration="0.2" />
</Transitions> </Transitions>
</Setter> </Setter>
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
<Setter Property="RenderTransform" Value="scale(1.0)" /> <Setter Property="RenderTransform" Value="scale(1.0)" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:CustomDialogControl"> <ControlTemplate TargetType="u:CustomDialogControl">
@@ -38,8 +40,8 @@
<ScrollViewer <ScrollViewer
Grid.Row="0" Grid.Row="0"
Grid.RowSpan="2" Grid.RowSpan="2"
HorizontalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="{Binding (ScrollViewer.HorizontalScrollBarVisibility), RelativeSource={RelativeSource TemplatedParent}}"
VerticalScrollBarVisibility="Auto"> VerticalScrollBarVisibility="{Binding (ScrollViewer.VerticalScrollBarVisibility), RelativeSource={RelativeSource TemplatedParent}}">
<ContentPresenter Name="PART_ContentPresenter" Content="{TemplateBinding Content}" /> <ContentPresenter Name="PART_ContentPresenter" Content="{TemplateBinding Content}" />
</ScrollViewer> </ScrollViewer>
<Grid Grid.Row="0" ColumnDefinitions="*, Auto"> <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
@@ -132,6 +134,8 @@
<Setter Property="MinWidth" Value="{DynamicResource DialogMinWidth}" /> <Setter Property="MinWidth" Value="{DynamicResource DialogMinWidth}" />
<Setter Property="MinHeight" Value="{DynamicResource DialogMinHeight}" /> <Setter Property="MinHeight" Value="{DynamicResource DialogMinHeight}" />
<Setter Property="CornerRadius" Value="{DynamicResource DialogCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource DialogCornerRadius}" />
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
<Setter Property="Transitions"> <Setter Property="Transitions">
<Transitions> <Transitions>
<TransformOperationsTransition Property="RenderTransform" Duration="0.2" /> <TransformOperationsTransition Property="RenderTransform" Duration="0.2" />
@@ -157,8 +161,8 @@
<Grid RowDefinitions="Auto, *, Auto"> <Grid RowDefinitions="Auto, *, Auto">
<ScrollViewer <ScrollViewer
Grid.Row="1" Grid.Row="1"
HorizontalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="{Binding (ScrollViewer.HorizontalScrollBarVisibility), RelativeSource={RelativeSource TemplatedParent}}"
VerticalScrollBarVisibility="Auto"> VerticalScrollBarVisibility="{Binding (ScrollViewer.VerticalScrollBarVisibility), RelativeSource={RelativeSource TemplatedParent}}">
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" Name="PART_ContentPresenter"
Margin="24,8" Margin="24,8"

12
src/Ursa.Themes.Semi/Controls/Drawer.axaml
View File

@@ -9,6 +9,8 @@
<Setter Property="HorizontalAlignment" Value="Stretch" /> <Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="MinWidth" Value="96" /> <Setter Property="MinWidth" Value="96" />
<Setter Property="MinHeight" Value="96" /> <Setter Property="MinHeight" Value="96" />
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
<Setter Property="Padding" Value="{DynamicResource DrawerMargin}" /> <Setter Property="Padding" Value="{DynamicResource DrawerMargin}" />
<Setter Property="BorderThickness" Value="{DynamicResource DrawerBorderThickness}" /> <Setter Property="BorderThickness" Value="{DynamicResource DrawerBorderThickness}" />
<Setter Property="CornerRadius" Value="{DynamicResource DrawerCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource DrawerCornerRadius}" />
@@ -37,8 +39,8 @@
<ScrollViewer <ScrollViewer
Grid.Row="0" Grid.Row="0"
Grid.RowSpan="2" Grid.RowSpan="2"
HorizontalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="{Binding (ScrollViewer.HorizontalScrollBarVisibility), RelativeSource={RelativeSource TemplatedParent}}"
VerticalScrollBarVisibility="Auto"> VerticalScrollBarVisibility="{Binding (ScrollViewer.VerticalScrollBarVisibility), RelativeSource={RelativeSource TemplatedParent}}">
<ContentPresenter Name="PART_ContentPresenter" Content="{TemplateBinding Content}" /> <ContentPresenter Name="PART_ContentPresenter" Content="{TemplateBinding Content}" />
</ScrollViewer> </ScrollViewer>
<Grid Grid.Row="0" ColumnDefinitions="*, Auto"> <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
@@ -104,6 +106,8 @@
<Setter Property="HorizontalAlignment" Value="Stretch" /> <Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="MinWidth" Value="96" /> <Setter Property="MinWidth" Value="96" />
<Setter Property="MinHeight" Value="96" /> <Setter Property="MinHeight" Value="96" />
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
<Setter Property="Padding" Value="{DynamicResource DrawerMargin}" /> <Setter Property="Padding" Value="{DynamicResource DrawerMargin}" />
<Setter Property="BorderThickness" Value="{DynamicResource DrawerBorderThickness}" /> <Setter Property="BorderThickness" Value="{DynamicResource DrawerBorderThickness}" />
<Setter Property="CornerRadius" Value="{DynamicResource DrawerCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource DrawerCornerRadius}" />
@@ -131,8 +135,8 @@
<Grid RowDefinitions="Auto, *, Auto"> <Grid RowDefinitions="Auto, *, Auto">
<ScrollViewer <ScrollViewer
Grid.Row="1" Grid.Row="1"
HorizontalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="{Binding (ScrollViewer.HorizontalScrollBarVisibility), RelativeSource={RelativeSource TemplatedParent}}"
VerticalScrollBarVisibility="Auto"> VerticalScrollBarVisibility="{Binding (ScrollViewer.VerticalScrollBarVisibility), RelativeSource={RelativeSource TemplatedParent}}">
<ContentPresenter <ContentPresenter
Name="PART_ContentPresenter" Name="PART_ContentPresenter"
Margin="24,8" Margin="24,8"