Skip to content

Commit 1e73c07

Browse files
KebooKeboo
committed
Fixing merge conflicts from master
2 parents ff9c9d6 + 528d245 commit 1e73c07

File tree

5 files changed

+29
-49
lines changed

5 files changed

+29
-49
lines changed

‎MainDemo.Wpf/Expander.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@
4848
</Expander>
4949
</StackPanel>
5050
<materialDesign:Card Grid.Row="1" Background="{DynamicResource MaterialDesignBackground}"
51-
Margin="0 24 0 0">
51+
Margin="4 24 0 0">
5252
<StackPanel>
5353
<Expander HorizontalAlignment="Stretch"
54-
Header="Expander Example 2a">
54+
Header="Expander Example 2a">
5555
<StackPanel Orientation="Vertical"
5656
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
5757
Margin="24,8,24,16">

‎MaterialDesignThemes.MahApps/Themes/MaterialDesignTheme.MahApps.Flyout.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
IsCancel="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:Flyout}}, Path=CloseButtonIsCancel}"
2727
Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:Flyout}}, Path=CloseButtonVisibility}">
2828
<ContentControl Style="{DynamicResource PathIconContentControlStyle}"
29-
Content="M19,34V42H43.75L33.75,52H44.25L58.25,38L44.25,24H33.75L43.75,34H19Z"
30-
Width="20"
31-
Height="20" />
29+
Content="M8.59,16.58L13.17,12L8.59,7.41L10,6L16,12L10,18L8.59,16.58Z"
30+
Width="16"
31+
Height="16" />
3232
</Button>
3333
<TextBlock x:Name="PART_BackHeaderText"
3434
Margin="15 0 0 0"

‎MaterialDesignThemes.Wpf/Themes/Generic.xaml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -530,12 +530,7 @@
530530
<VisualTransition From="Open" To="Closed">
531531
<Storyboard>
532532
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="PART_Popup" Storyboard.TargetProperty="IsOpen">
533-
<DiscreteBooleanKeyFrame Value="True" KeyTime="0:0:0" />
534-
<DiscreteBooleanKeyFrame Value="True" KeyTime="0:0:0.3" />
535-
</BooleanAnimationUsingKeyFrames>
536-
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="PART_Popup" Storyboard.TargetProperty="IsOpen">
537-
<DiscreteBooleanKeyFrame Value="True" KeyTime="0:0:0" />
538-
<DiscreteBooleanKeyFrame Value="True" KeyTime="0:0:0.3" />
533+
<DiscreteBooleanKeyFrame Value="False" KeyTime="0:0:0.3" />
539534
</BooleanAnimationUsingKeyFrames>
540535
<DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentCoverGrid" Storyboard.TargetProperty="Opacity">
541536
<EasingDoubleKeyFrame Value="0.56" KeyTime="0" />
@@ -597,7 +592,6 @@
597592
<VisualState x:Name="Closed">
598593
<Storyboard>
599594
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="PART_Popup" Storyboard.TargetProperty="IsOpen">
600-
<DiscreteBooleanKeyFrame Value="True" KeyTime="0:0:0" />
601595
<DiscreteBooleanKeyFrame Value="False" KeyTime="0:0:0.3" />
602596
</BooleanAnimationUsingKeyFrames>
603597
</Storyboard>

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Expander.xaml‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,8 @@
272272
</VisualState>
273273
</VisualStateGroup>
274274
</VisualStateManager.VisualStateGroups>
275-
<Grid>
276-
<DockPanel Background="{TemplateBinding Background}">
277-
<ToggleButton Name="HeaderSite"
275+
<DockPanel Background="{TemplateBinding Background}">
276+
<ToggleButton Name="HeaderSite"
278277
DockPanel.Dock="Top"
279278
BorderThickness="0" Cursor="Hand"
280279
IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
@@ -286,32 +285,31 @@
286285
ContentTemplate="{TemplateBinding HeaderTemplate}"
287286
ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
288287
ContentStringFormat="{TemplateBinding HeaderStringFormat}"/>
289-
<Border Name="ContentSite"
288+
<Border Name="ContentSite"
290289
DockPanel.Dock="Bottom" >
291-
<StackPanel Name="ContentPanel"
290+
<StackPanel Name="ContentPanel"
292291
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
293292
Margin="{TemplateBinding Padding}"
294293
VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
295-
<StackPanel.Height>
296-
<MultiBinding Converter="{StaticResource MathMlpMultipleConverter}">
297-
<Binding ElementName="PART_Content" Path="ActualHeight"/>
298-
<Binding ElementName="PART_Content" Path="Opacity"/>
299-
</MultiBinding>
300-
</StackPanel.Height>
301-
<StackPanel.Width>
302-
<MultiBinding Converter="{StaticResource MathMlpMultipleConverter}">
303-
<Binding ElementName="PART_Content" Path="ActualWidth"/>
304-
<Binding ElementName="PART_Content" Path="Opacity"/>
305-
</MultiBinding>
306-
</StackPanel.Width>
307-
<ContentPresenter Name="PART_Content" Focusable="False"
294+
<StackPanel.Height>
295+
<MultiBinding Converter="{StaticResource MathMlpMultipleConverter}">
296+
<Binding ElementName="PART_Content" Path="ActualHeight"/>
297+
<Binding ElementName="PART_Content" Path="Opacity"/>
298+
</MultiBinding>
299+
</StackPanel.Height>
300+
<StackPanel.Width>
301+
<MultiBinding Converter="{StaticResource MathMlpMultipleConverter}">
302+
<Binding ElementName="PART_Content" Path="ActualWidth"/>
303+
<Binding ElementName="PART_Content" Path="Opacity"/>
304+
</MultiBinding>
305+
</StackPanel.Width>
306+
<ContentPresenter Name="PART_Content" Focusable="False"
308307
ContentTemplate="{TemplateBinding ContentTemplate}"
309308
ContentStringFormat="{TemplateBinding ContentStringFormat}"
310309
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"/>
311-
</StackPanel>
312-
</Border>
313-
</DockPanel>
314-
</Grid>
310+
</StackPanel>
311+
</Border>
312+
</DockPanel>
315313
</Border>
316314
<ControlTemplate.Triggers>
317315
<Trigger Property="ExpandDirection" Value="Right">

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,17 @@
3030
<ContextMenu>
3131
<MenuItem Header="_Cut" Command="Cut">
3232
<MenuItem.Icon>
33-
<Viewbox Width="16" Height="16">
34-
<Canvas Width="24" Height="24">
35-
<Path Data="M19,3L13,9L15,11L22,4V3M12,12.5A0.5,0.5 0 0,1 11.5,12A0.5,0.5 0 0,1 12,11.5A0.5,0.5 0 0,1 12.5,12A0.5,0.5 0 0,1 12,12.5M6,20A2,2 0 0,1 4,18C4,16.89 4.9,16 6,16A2,2 0 0,1 8,18C8,19.11 7.1,20 6,20M6,8A2,2 0 0,1 4,6C4,4.89 4.9,4 6,4A2,2 0 0,1 8,6C8,7.11 7.1,8 6,8M9.64,7.64C9.87,7.14 10,6.59 10,6A4,4 0 0,0 6,2A4,4 0 0,0 2,6A4,4 0 0,0 6,10C6.59,10 7.14,9.87 7.64,9.64L10,12L7.64,14.36C7.14,14.13 6.59,14 6,14A4,4 0 0,0 2,18A4,4 0 0,0 6,22A4,4 0 0,0 10,18C10,17.41 9.87,16.86 9.64,16.36L12,14L19,21H22V20L9.64,7.64Z" Fill="{DynamicResource MaterialDesignBody}" />
36-
</Canvas>
37-
</Viewbox>
33+
<wpf:PackIcon Kind="ContentCut"/>
3834
</MenuItem.Icon>
3935
</MenuItem>
4036
<MenuItem Header="_Copy" Command="Copy">
4137
<MenuItem.Icon>
42-
<Viewbox Width="16" Height="16">
43-
<Canvas Width="24" Height="24">
44-
<Path Data="M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z" Fill="{DynamicResource MaterialDesignBody}" />
45-
</Canvas>
46-
</Viewbox>
38+
<wpf:PackIcon Kind="ContentCopy" />
4739
</MenuItem.Icon>
4840
</MenuItem>
4941
<MenuItem Header="_Paste" Command="Paste">
5042
<MenuItem.Icon>
51-
<Viewbox Width="16" Height="16">
52-
<Canvas Width="24" Height="24">
53-
<Path Data="M19,20H5V4H7V7H17V4H19M12,2A1,1 0 0,1 13,3A1,1 0 0,1 12,4A1,1 0 0,1 11,3A1,1 0 0,1 12,2M19,2H14.82C14.4,0.84 13.3,0 12,0C10.7,0 9.6,0.84 9.18,2H5A2,2 0 0,0 3,4V20A2,2 0 0,0 5,22H19A2,2 0 0,0 21,20V4A2,2 0 0,0 19,2Z" Fill="{DynamicResource MaterialDesignBody}" />
54-
</Canvas>
55-
</Viewbox>
43+
<wpf:PackIcon Kind="ContentPaste"/>
5644
</MenuItem.Icon>
5745
</MenuItem>
5846
</ContextMenu>

0 commit comments

Comments
 (0)