Skip to content

Commit

Permalink
Add ContentPresenterEx
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kinnara
Kinnara committed Apr 2, 2020
1 parent 5bbb2f2 commit d3e87dd
Show file tree
Hide file tree
Showing 15 changed files with 422 additions and 173 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>0.8.1</Version>
<Version>0.8.2-preview.200402.5</Version>
<Authors>Yimeng Wu</Authors>
<Product>ModernWPF UI Library</Product>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
23 changes: 6 additions & 17 deletions ModernWpf.Controls/ContentDialog/ContentDialog.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,23 +314,17 @@
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
<ContentControl.Template>
<ControlTemplate TargetType="ContentControl">
<ContentPresenter
<ui:ContentPresenterEx
Content="{TemplateBinding Content}"
TextWrapping="Wrap"
ContentTemplate="{TemplateBinding ContentTemplate}"
Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
<ContentPresenter.Resources>
<Style TargetType="TextBlock">
<!--<Setter Property="MaxLines" Value="2" />-->
<Setter Property="TextWrapping" Value="Wrap" />
</Style>
</ContentPresenter.Resources>
</ContentPresenter>
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
</ControlTemplate>
</ContentControl.Template>
</ContentControl>
<ContentPresenter
<ui:ContentPresenterEx
x:Name="Content"
ContentTemplate="{TemplateBinding ContentTemplate}"
Content="{TemplateBinding Content}"
Expand All @@ -339,13 +333,8 @@
Margin="{DynamicResource ContentDialogContentMargin}"
TextElement.Foreground="{TemplateBinding Foreground}"
Grid.Row="1"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
<ContentPresenter.Resources>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
</Style>
</ContentPresenter.Resources>
</ContentPresenter>
TextWrapping="Wrap"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Grid>
</ScrollViewer>
<Grid
Expand Down
34 changes: 12 additions & 22 deletions ModernWpf.Controls/NumberBox/NumberBox.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,25 +106,20 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<ContentPresenter
<ui:ContentPresenterEx
x:Name="HeaderContentPresenter"
Grid.Row="0"
Grid.Column="0"
Grid.ColumnSpan="2"
Content="{TemplateBinding ui:ControlHelper.Header}"
ContentTemplate="{TemplateBinding ui:ControlHelper.HeaderTemplate}"
TextElement.FontWeight="Normal"
TextElement.Foreground="{DynamicResource TextControlHeaderForeground}"
FontWeight="Normal"
Foreground="{DynamicResource TextControlHeaderForeground}"
Margin="{DynamicResource TextBoxTopHeaderMargin}"
TextWrapping="Wrap"
VerticalAlignment="Top"
Visibility="{TemplateBinding ui:ControlHelper.HeaderVisibility}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
<ContentPresenter.Resources>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
</Style>
</ContentPresenter.Resources>
</ContentPresenter>
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
<!-- Control.IsTemplateFocusTarget="True" -->
<Border
x:Name="BorderElement"
Expand Down Expand Up @@ -206,7 +201,7 @@
<Setter TargetName="PlaceholderTextContentPresenter" Property="Visibility" Value="Collapsed" />
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter TargetName="HeaderContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TextControlHeaderForegroundDisabled}" />
<Setter TargetName="HeaderContentPresenter" Property="Foreground" Value="{DynamicResource TextControlHeaderForegroundDisabled}" />
<Setter Property="Background" Value="{DynamicResource TextControlBackgroundDisabled}" />
<Setter TargetName="BorderElement" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
<Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
Expand Down Expand Up @@ -329,23 +324,18 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>

<ContentPresenter
<ui:ContentPresenterEx
x:Name="HeaderContentPresenter"
Grid.ColumnSpan="3"
Content="{TemplateBinding Header}"
ContentTemplate="{TemplateBinding HeaderTemplate}"
TextElement.FontWeight="Normal"
TextElement.Foreground="{DynamicResource TextControlHeaderForeground}"
FontWeight="Normal"
Foreground="{DynamicResource TextControlHeaderForeground}"
Margin="{DynamicResource TextBoxTopHeaderMargin}"
TextWrapping="Wrap"
VerticalAlignment="Top"
Visibility="{TemplateBinding ui:ControlHelper.HeaderVisibility}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
<ContentPresenter.Resources>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
</Style>
</ContentPresenter.Resources>
</ContentPresenter>
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />

<TextBox
x:Name="InputBox"
Expand Down Expand Up @@ -426,7 +416,7 @@
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsEnabled" Value="false">
<Setter TargetName="HeaderContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TextControlHeaderForegroundDisabled}" />
<Setter TargetName="HeaderContentPresenter" Property="Foreground" Value="{DynamicResource TextControlHeaderForegroundDisabled}" />
</Trigger>
<!-- SpinButtonsVisible -->
<Trigger Property="SpinButtonPlacementMode" Value="Inline">
Expand Down
17 changes: 6 additions & 11 deletions ModernWpf.Controls/ToggleSwitch/ToggleSwitch.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,23 +179,18 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>

<ContentPresenter
<ui:ContentPresenterEx
x:Name="HeaderContentPresenter"
Grid.Row="0"
Content="{TemplateBinding Header}"
ContentTemplate="{TemplateBinding HeaderTemplate}"
TextElement.Foreground="{DynamicResource ToggleSwitchHeaderForeground}"
IsHitTestVisible="False"
Margin="{DynamicResource ToggleSwitchTopHeaderMargin}"
TextWrapping="Wrap"
VerticalAlignment="Top"
Visibility="Collapsed"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
<ContentPresenter.Resources>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
</Style>
</ContentPresenter.Resources>
</ContentPresenter>
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
<Grid
Grid.Row="1"
MinWidth="{StaticResource ToggleSwitchThemeMinWidth}"
Expand Down Expand Up @@ -330,7 +325,7 @@
</Trigger>
<!-- Disabled -->
<Trigger Property="IsEnabled" Value="false">
<Setter Property="TextElement.Foreground" TargetName="HeaderContentPresenter" Value="{DynamicResource ToggleSwitchHeaderForegroundDisabled}" />
<Setter Property="Foreground" TargetName="HeaderContentPresenter" Value="{DynamicResource ToggleSwitchHeaderForegroundDisabled}" />
<Setter Property="TextElement.Foreground" TargetName="OffContentPresenter" Value="{DynamicResource ToggleSwitchContentForegroundDisabled}" />
<Setter Property="TextElement.Foreground" TargetName="OnContentPresenter" Value="{DynamicResource ToggleSwitchContentForegroundDisabled}" />
<Setter Property="Stroke" TargetName="OuterBorder" Value="{DynamicResource ToggleSwitchStrokeOffDisabled}" />
Expand All @@ -341,14 +336,14 @@
<Setter Property="Stroke" TargetName="SwitchKnobBounds" Value="{DynamicResource ToggleSwitchStrokeOnDisabled}" />
<Setter Property="Background" TargetName="SwitchAreaGrid" Value="{DynamicResource ToggleSwitchContainerBackgroundDisabled}" />
</Trigger>

<Trigger Property="IsOn" Value="true">
<Setter TargetName="SwitchKnobBounds" Property="Opacity" Value="1" />
<Setter TargetName="OuterBorder" Property="Opacity" Value="0" />
<Setter TargetName="SwitchKnobOn" Property="Opacity" Value="1" />
<Setter TargetName="SwitchKnobOff" Property="Opacity" Value="0" />
</Trigger>

<Trigger Property="ui:FocusVisualHelper.IsSystemFocusVisualVisible" Value="True">
<Setter TargetName="FocusVisual" Property="Visibility" Value="Visible" />
</Trigger>
Expand Down
13 changes: 4 additions & 9 deletions ModernWpf.MahApps/Themes/SimpleTimePicker.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,23 +185,18 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>

<ContentPresenter
<ui:ContentPresenterEx
x:Name="HeaderContentPresenter"
Grid.Row="0"
Content="{TemplateBinding Header}"
ContentTemplate="{TemplateBinding HeaderTemplate}"
Margin="{DynamicResource TimePickerTopHeaderMargin}"
MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
TextElement.Foreground="{DynamicResource TimePickerHeaderForeground}"
Foreground="{DynamicResource TimePickerHeaderForeground}"
TextWrapping="Wrap"
HorizontalAlignment="Stretch"
VerticalAlignment="Top"
Visibility="{TemplateBinding ui:ControlHelper.HeaderVisibility}">
<ContentPresenter.Resources>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
</Style>
</ContentPresenter.Resources>
</ContentPresenter>
Visibility="{TemplateBinding ui:ControlHelper.HeaderVisibility}" />
<Button
x:Name="PART_Button"
Grid.Row="1"
Expand Down
Loading

0 comments on commit d3e87dd

Please sign in to comment.