Skip to content

Commit 87bf90f

Browse files
punker76punker76
committed
Applying XamlStyler
1 parent bb3b4f6 commit 87bf90f

File tree

3 files changed

+55
-53
lines changed

3 files changed

+55
-53
lines changed

‎src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/MultiSelectionComboBoxExample.xaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<UserControl x:Class="MetroDemo.ExampleViews.MultiSelectionComboBoxExample"
1+
<UserControl x:Class="MetroDemo.ExampleViews.MultiSelectionComboBoxExample"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -283,22 +283,22 @@
283283
<mah:MultiSelectionComboBox x:Name="mscb_Example"
284284
Margin="5"
285285
VerticalAlignment="Center"
286-
InterceptMouseWheelSelection="False"
286+
mah:MultiSelectorHelper.SelectedItems="{Binding SelectedAnimals}"
287287
mah:TextBoxHelper.AutoWatermark="True"
288288
mah:TextBoxHelper.UseFloatingWatermark="True"
289+
AddedItem="Mscb_Example_AddedItem"
290+
AddingItem="Mscb_Example_AddingItem"
289291
EditableTextStringComparision="CurrentCultureIgnoreCase"
292+
InterceptMouseWheelSelection="False"
290293
ItemContainerStyle="{Binding ElementName=Cmb_ItemContainerStyle, Path=SelectedItem.Tag}"
291294
ItemsSource="{Binding Animals}"
292295
ObjectToStringComparer="{mah:DefaultObjectToStringComparer}"
293-
StringToObjectParser="{x:Static mah:BuiltInStringToObjectParser.Instance}"
294296
SelectedItemContainerStyle="{Binding ElementName=Cmb_SelectedItemContainerStyle, Path=SelectedItem.Tag}"
297+
SelectionChanged="mscb_Example_SelectionChanged"
295298
Separator=", "
299+
StringToObjectParser="{x:Static mah:BuiltInStringToObjectParser.Instance}"
296300
Style="{Binding ElementName=CmbSelectStyle, Path=SelectedItem.Tag}"
297-
TextWrapping="Wrap"
298-
AddingItem="Mscb_Example_AddingItem"
299-
AddedItem="Mscb_Example_AddedItem"
300-
mah:MultiSelectorHelper.SelectedItems="{Binding SelectedAnimals}"
301-
SelectionChanged="mscb_Example_SelectionChanged"/>
301+
TextWrapping="Wrap" />
302302
</Grid>
303303
</GroupBox>
304304
</Grid>

‎src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@
8080
<Setter Property="Header" Value="{Binding Mode=OneTime}" />
8181
</Style>
8282

83-
<UserControl x:Key="CustomDialogTest" x:Name="CustomDialogTest"
83+
<UserControl x:Key="CustomDialogTest"
84+
x:Name="CustomDialogTest"
8485
MinHeight="200">
8586

8687
<TextBlock x:Name="MessageTextBlock" Text="Message shown by this custom Dialog." />
@@ -90,12 +91,12 @@
9091
<UserControl x:Key="CustomCloseDialogTest" x:Name="CustomCloseDialogTest">
9192

9293
<StackPanel>
93-
<TextBlock Text="This dialog allows arbitrary content. You have to close it yourself by clicking the close button below."
94-
Height="30"
95-
Margin="0,4"
94+
<TextBlock Height="30"
95+
Margin="0 4"
96+
Text="This dialog allows arbitrary content. You have to close it yourself by clicking the close button below."
9697
TextWrapping="Wrap" />
97-
<Button Content="Close Me!"
98-
Click="CloseCustomDialog"
98+
<Button Click="CloseCustomDialog"
99+
Content="Close Me!"
99100
Style="{DynamicResource MahApps.Styles.Button.Dialogs}" />
100101
</StackPanel>
101102

@@ -116,23 +117,23 @@
116117

117118
<mah:MetroWindow.RightWindowCommands>
118119
<mah:WindowCommands ShowLastSeparator="False">
119-
<Button Content="Flyouts"
120-
Click="LaunchFlyoutDemo"
120+
<Button Click="LaunchFlyoutDemo"
121+
Content="Flyouts"
121122
ToolTip="Flyouts demo window" />
122-
<Button Content="IconPacks"
123-
Click="LaunchIcons"
123+
<Button Click="LaunchIcons"
124+
Content="IconPacks"
124125
ToolTip="All MahApp icons" />
125-
<Button Content="VS"
126-
Click="LaunchVisualStudioDemo"
126+
<Button Click="LaunchVisualStudioDemo"
127+
Content="VS"
127128
ToolTip="Visual Studio style demo" />
128-
<Button Content="Clean"
129-
Click="LauchCleanDemo"
129+
<Button Click="LauchCleanDemo"
130+
Content="Clean"
130131
ToolTip="Clean window style demo" />
131-
<Button Content="Interop"
132-
Click="InteropDemo"
132+
<Button Click="InteropDemo"
133+
Content="Interop"
133134
ToolTip="The interop demo" />
134-
<Button Content="Navigation"
135-
Click="LaunchNavigationDemo"
135+
<Button Click="LaunchNavigationDemo"
136+
Content="Navigation"
136137
ToolTip="Window navigation demo" />
137138
<ToggleButton Content="Confirm quit"
138139
IsChecked="{Binding QuitConfirmationEnabled}"
@@ -195,12 +196,12 @@
195196
<MenuItem Command="{Binding ShowInputDialogCommand}" Header="Show InputDialog via VM" />
196197
<MenuItem Command="{Binding ShowLoginDialogCommand}" Header="Show LoginDialog via VM ..." />
197198
<MenuItem Header="Show MessageDialog via VM">
198-
<MenuItem Header="... from Main Thread"
199-
Command="{Binding ShowMessageDialogCommand}"
200-
CommandParameter="DISPATCHER_THREAD" />
201-
<MenuItem Header="... from Background Thread"
202-
Command="{Binding ShowMessageDialogCommand}"
203-
CommandParameter="BACKGROUND_THREAD" />
199+
<MenuItem Command="{Binding ShowMessageDialogCommand}"
200+
CommandParameter="DISPATCHER_THREAD"
201+
Header="... from Main Thread" />
202+
<MenuItem Command="{Binding ShowMessageDialogCommand}"
203+
CommandParameter="BACKGROUND_THREAD"
204+
Header="... from Background Thread" />
204205
</MenuItem>
205206

206207
<MenuItem Command="{Binding ShowProgressDialogCommand}" Header="Show ProgressDialog via VM" />
@@ -229,22 +230,23 @@
229230
<MenuItem Click="MenuWindowWithShadowOnClick" Header="Window with drop shadow" />
230231
<MenuItem Click="LaunchSizeToContentDemo" Header="Window with SizeToContent" />
231232
<Separator />
232-
<MenuItem x:Name="ShowSeparatorsMI" Header="ShowSeparators (RightWindowCommands)"
233+
<MenuItem x:Name="ShowSeparatorsMI"
234+
Header="ShowSeparators (RightWindowCommands)"
233235
IsCheckable="True"
234236
IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}, Path=RightWindowCommands.ShowSeparators}" />
235237
<MenuItem Header="ShowLastSeparator in (RightWindowCommands)"
236238
IsCheckable="True"
237239
IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}, Path=RightWindowCommands.ShowLastSeparator}"
238240
IsEnabled="{Binding ElementName=ShowSeparatorsMI, Path=IsChecked, Mode=OneWay}" />
239241
<Separator />
240-
<MenuItem Header="Window icon: scale down larger frame"
241-
Command="{Binding ToggleIconScalingCommand}"
242+
<MenuItem Command="{Binding ToggleIconScalingCommand}"
242243
CommandParameter="{x:Static mah:MultiFrameImageMode.ScaleDownLargerFrame}"
244+
Header="Window icon: scale down larger frame"
243245
IsCheckable="True"
244246
IsChecked="{Binding IsScaleDownLargerFrame, Mode=OneWay}" />
245-
<MenuItem Header="Window icon: no scale, smaller frame"
246-
Command="{Binding ToggleIconScalingCommand}"
247+
<MenuItem Command="{Binding ToggleIconScalingCommand}"
247248
CommandParameter="{x:Static mah:MultiFrameImageMode.NoScaleSmallerFrame}"
249+
Header="Window icon: no scale, smaller frame"
248250
IsCheckable="True"
249251
IsChecked="{Binding IsNoScaleSmallerFrame, Mode=OneWay}" />
250252
<Separator />
@@ -331,7 +333,7 @@
331333
</TabItem>
332334

333335
<TabItem Header="MultiSelectionComboBox">
334-
<exampleViews:MultiSelectionComboBoxExample/>
336+
<exampleViews:MultiSelectionComboBoxExample />
335337
</TabItem>
336338

337339
<TabItem Header="others">

‎src/MahApps.Metro/Themes/MultiSelectionComboBox.xaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -661,15 +661,16 @@
661661
<RowDefinition Height="*" />
662662
<RowDefinition Height="Auto" />
663663
</Grid.RowDefinitions>
664-
665-
<ContentControl Content="{TemplateBinding DropDownHeaderContent}"
664+
665+
<ContentControl Grid.Row="0"
666+
Content="{TemplateBinding DropDownHeaderContent}"
667+
ContentStringFormat="{TemplateBinding DropDownHeaderContentStringFormat}"
666668
ContentTemplate="{TemplateBinding DropDownHeaderContentTemplate}"
667669
ContentTemplateSelector="{TemplateBinding DropDownHeaderContentTemplateSelector}"
668-
ContentStringFormat="{TemplateBinding DropDownHeaderContentStringFormat}"
669-
Visibility="{TemplateBinding IsDropDownHeaderVisible, Converter={StaticResource BooleanToVisibilityConverter}}"
670-
Grid.Row="0" />
671-
670+
Visibility="{TemplateBinding IsDropDownHeaderVisible, Converter={StaticResource BooleanToVisibilityConverter}}" />
671+
672672
<ListBox x:Name="PART_PopupListBox"
673+
Grid.Row="1"
673674
AlternationCount="{TemplateBinding AlternationCount}"
674675
Focusable="False"
675676
ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
@@ -683,23 +684,22 @@
683684
SelectedValue="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=SelectedValue, Mode=TwoWay}"
684685
SelectedValuePath="{TemplateBinding SelectedValuePath}"
685686
SelectionMode="{TemplateBinding SelectionMode}"
686-
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
687-
Grid.Row="1" />
687+
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
688688

689-
<ContentControl Content="{TemplateBinding DropDownFooterContent}"
689+
<ContentControl Grid.Row="2"
690+
Content="{TemplateBinding DropDownFooterContent}"
691+
ContentStringFormat="{TemplateBinding DropDownFooterContentStringFormat}"
690692
ContentTemplate="{TemplateBinding DropDownFooterContentTemplate}"
691693
ContentTemplateSelector="{TemplateBinding DropDownFooterContentTemplateSelector}"
692-
ContentStringFormat="{TemplateBinding DropDownFooterContentStringFormat}"
693-
Visibility="{TemplateBinding IsDropDownFooterVisible, Converter={StaticResource BooleanToVisibilityConverter}}"
694-
Grid.Row="2" />
695-
694+
Visibility="{TemplateBinding IsDropDownFooterVisible, Converter={StaticResource BooleanToVisibilityConverter}}" />
695+
696696
<ContentControl x:Name="PART_PopupOverlay"
697+
Grid.RowSpan="3"
697698
HorizontalAlignment="Stretch"
698699
VerticalAlignment="Stretch"
699700
Content="{TemplateBinding DisabledPopupOverlayContent}"
700701
ContentTemplate="{TemplateBinding DisabledPopupOverlayContentTemplate}"
701-
Visibility="Collapsed"
702-
Grid.RowSpan="3" />
702+
Visibility="Collapsed" />
703703
</Grid>
704704
</Border>
705705
</Grid>

0 commit comments

Comments
 (0)