Skip to content

Commit b066f93

Browse files
ButchersBoyButchersBoy
committed
update mashup demo [skip ci]
1 parent 577f647 commit b066f93

File tree

11 files changed

+27
-421
lines changed

11 files changed

+27
-421
lines changed

‎MahMaterialDragablzMashUp/Buttons.xaml

Lines changed: 0 additions & 96 deletions
This file was deleted.

‎MahMaterialDragablzMashUp/Buttons.xaml.cs

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎MahMaterialDragablzMashUp/Cards.xaml

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎MahMaterialDragablzMashUp/Cards.xaml.cs

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,6 @@
8181
<Generator>MSBuild:Compile</Generator>
8282
<SubType>Designer</SubType>
8383
</ApplicationDefinition>
84-
<Page Include="Buttons.xaml">
85-
<SubType>Designer</SubType>
86-
<Generator>MSBuild:Compile</Generator>
87-
</Page>
88-
<Page Include="Cards.xaml">
89-
<SubType>Designer</SubType>
90-
<Generator>MSBuild:Compile</Generator>
91-
</Page>
9284
<Page Include="Dialogs.xaml">
9385
<SubType>Designer</SubType>
9486
<Generator>MSBuild:Compile</Generator>
@@ -97,10 +89,6 @@
9789
<SubType>Designer</SubType>
9890
<Generator>MSBuild:Compile</Generator>
9991
</Page>
100-
<Page Include="TextFields.xaml">
101-
<SubType>Designer</SubType>
102-
<Generator>MSBuild:Compile</Generator>
103-
</Page>
10492
<Page Include="Mah.xaml">
10593
<SubType>Designer</SubType>
10694
<Generator>MSBuild:Compile</Generator>
@@ -114,12 +102,6 @@
114102
<DependentUpon>App.xaml</DependentUpon>
115103
<SubType>Code</SubType>
116104
</Compile>
117-
<Compile Include="Buttons.xaml.cs">
118-
<DependentUpon>Buttons.xaml</DependentUpon>
119-
</Compile>
120-
<Compile Include="Cards.xaml.cs">
121-
<DependentUpon>Cards.xaml</DependentUpon>
122-
</Compile>
123105
<Compile Include="Dialogs.xaml.cs">
124106
<DependentUpon>Dialogs.xaml</DependentUpon>
125107
</Compile>
@@ -128,9 +110,6 @@
128110
<DependentUpon>FlyoutContent.xaml</DependentUpon>
129111
</Compile>
130112
<Compile Include="PaletteSelectorViewModel.cs" />
131-
<Compile Include="TextFields.xaml.cs">
132-
<DependentUpon>TextFields.xaml</DependentUpon>
133-
</Compile>
134113
<Compile Include="Mah.xaml.cs">
135114
<DependentUpon>Mah.xaml</DependentUpon>
136115
</Compile>

‎MahMaterialDragablzMashUp/MainWindow.xaml

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,11 @@
1919
</controls:FlyoutsControl>
2020
</controls:MetroWindow.Flyouts>
2121
<dockablz:Layout>
22-
<dragablz:TabablzControl TextElement.Foreground="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=Window}, Path=(TextElement.Foreground)}"
23-
Background="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=Window}, Path=Background}"
24-
BorderThickness="0"
22+
<dragablz:TabablzControl BorderThickness="0"
2523
Margin="0,-1,0,1">
2624
<dragablz:TabablzControl.InterTabController>
2725
<dragablz:InterTabController />
2826
</dragablz:TabablzControl.InterTabController>
29-
<TabItem Header="CARDS">
30-
<mahMaterialDragablzMashUp:Cards Margin="8" />
31-
</TabItem>
32-
<TabItem Header="BUTTONS">
33-
<mahMaterialDragablzMashUp:Buttons Margin="8" />
34-
</TabItem>
35-
<TabItem Header="FIELDS">
36-
<mahMaterialDragablzMashUp:TextFields Margin="8" />
37-
</TabItem>
38-
<TabItem Header="PALETTE">
39-
<mahMaterialDragablzMashUp:PaletteSelector Margin="16">
40-
<mahMaterialDragablzMashUp:PaletteSelector.DataContext>
41-
<mahMaterialDragablzMashUp:PaletteSelectorViewModel />
42-
</mahMaterialDragablzMashUp:PaletteSelector.DataContext>
43-
</mahMaterialDragablzMashUp:PaletteSelector>
44-
</TabItem>
4527
<TabItem Header="DIALOGS">
4628
<mahMaterialDragablzMashUp:Dialogs Margin="8">
4729
<mahMaterialDragablzMashUp:Dialogs.DataContext>
@@ -50,8 +32,15 @@
5032
</mahMaterialDragablzMashUp:Dialogs>
5133
</TabItem>
5234
<TabItem Header="MAHAPPS">
53-
<mahMaterialDragablzMashUp:Mah Margin="8" />
35+
<mahMaterialDragablzMashUp:Mah Margin="16" />
5436
</TabItem>
37+
<TabItem Header="PALETTE">
38+
<mahMaterialDragablzMashUp:PaletteSelector Margin="16">
39+
<mahMaterialDragablzMashUp:PaletteSelector.DataContext>
40+
<mahMaterialDragablzMashUp:PaletteSelectorViewModel />
41+
</mahMaterialDragablzMashUp:PaletteSelector.DataContext>
42+
</mahMaterialDragablzMashUp:PaletteSelector>
43+
</TabItem>
5544
</dragablz:TabablzControl>
5645
</dockablz:Layout>
5746
</controls:MetroWindow>

‎MahMaterialDragablzMashUp/PaletteSelector.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@
9696
<ColumnDefinition />
9797
</Grid.ColumnDefinitions>
9898
<TextBlock VerticalAlignment="Center">Standard Style</TextBlock>
99-
<ToggleButton Grid.Column="1" Margin="8 4 16 4" Command="{Binding ToggleBaseCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}" />
99+
<ToggleButton Grid.Column="1" Margin="8 4 16 4" Command="{Binding ToggleStyleCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}" />
100100
<TextBlock Grid.Column="2" VerticalAlignment="Center">Alternate Style</TextBlock>
101101
<TextBlock Grid.Row="1" VerticalAlignment="Center">Light</TextBlock>
102-
<ToggleButton Grid.Row="1" Grid.Column="1" Margin="8 0 16 0" Command="{Binding ToggleBaseCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}" />
102+
<ToggleButton Grid.Row="1" Grid.Column="1" Margin="8 4 16 4" Command="{Binding ToggleBaseCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}" />
103103
<TextBlock Grid.Row="1" Grid.Column="2" VerticalAlignment="Center">Dark</TextBlock>
104104
</Grid>
105105
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">

‎MahMaterialDragablzMashUp/PaletteSelectorViewModel.cs

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
using MaterialDesignColors;
1+
using System;
2+
using MaterialDesignColors;
23
using MaterialDesignThemes.Wpf;
34
using System.Collections.Generic;
5+
using System.Windows;
46
using System.Windows.Input;
57

68
namespace MahMaterialDragablzMashUp
@@ -22,9 +24,20 @@ public PaletteSelectorViewModel()
2224

2325
public ICommand ApplyAccentCommand { get; } = new AnotherCommandImplementation(o => ApplyAccent((Swatch)o));
2426

25-
private void ApplyStyle(bool b)
27+
private static void ApplyStyle(bool alternate)
2628
{
27-
throw new System.NotImplementedException();
29+
var resourceDictionary = new ResourceDictionary
30+
{
31+
Source = new Uri(@"pack://application:,,,/Dragablz;component/Themes/materialdesign.xaml")
32+
};
33+
34+
var styleKey = alternate ? "MaterialDesignAlternateTabablzControlStyle" : "MaterialDesignTabablzControlStyle";
35+
var style = (Style) resourceDictionary[styleKey];
36+
37+
foreach (var tabablzControl in Dragablz.TabablzControl.GetLoadedInstances())
38+
{
39+
tabablzControl.Style = style;
40+
}
2841
}
2942

3043
private static void ApplyBase(bool isDark)

0 commit comments

Comments
 (0)