Skip to content

Commit 1e59901

Browse files
spiegelpspiegelp
committed
Merge pull request #11 from ButchersBoy/master
update from original repo
2 parents a662a2e + e1d83ca commit 1e59901

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+603
-678
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: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,20 @@
5050
<Prefer32Bit>true</Prefer32Bit>
5151
</PropertyGroup>
5252
<ItemGroup>
53-
<Reference Include="Dragablz, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
54-
<SpecificVersion>False</SpecificVersion>
55-
<HintPath>..\packages\Dragablz.0.0.1.109\lib\net45\Dragablz.dll</HintPath>
53+
<Reference Include="Dragablz, Version=0.0.3.151, Culture=neutral, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Dragablz.0.0.3.151\lib\net45\Dragablz.dll</HintPath>
55+
<Private>True</Private>
5656
</Reference>
57-
<Reference Include="MahApps.Metro, Version=1.1.3.157, Culture=neutral, processorArchitecture=MSIL">
58-
<HintPath>..\packages\MahApps.Metro.1.1.3-ALPHA157\lib\net45\MahApps.Metro.dll</HintPath>
57+
<Reference Include="MahApps.Metro, Version=1.2.0.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
58+
<HintPath>..\packages\MahApps.Metro.1.2.0.0\lib\net45\MahApps.Metro.dll</HintPath>
5959
<Private>True</Private>
6060
</Reference>
6161
<Reference Include="System" />
6262
<Reference Include="System.Data" />
63+
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<HintPath>..\packages\MahApps.Metro.1.2.0.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
65+
<Private>True</Private>
66+
</Reference>
6367
<Reference Include="System.Xml" />
6468
<Reference Include="Microsoft.CSharp" />
6569
<Reference Include="System.Core" />
@@ -77,14 +81,6 @@
7781
<Generator>MSBuild:Compile</Generator>
7882
<SubType>Designer</SubType>
7983
</ApplicationDefinition>
80-
<Page Include="Buttons.xaml">
81-
<SubType>Designer</SubType>
82-
<Generator>MSBuild:Compile</Generator>
83-
</Page>
84-
<Page Include="Cards.xaml">
85-
<SubType>Designer</SubType>
86-
<Generator>MSBuild:Compile</Generator>
87-
</Page>
8884
<Page Include="Dialogs.xaml">
8985
<SubType>Designer</SubType>
9086
<Generator>MSBuild:Compile</Generator>
@@ -93,10 +89,6 @@
9389
<SubType>Designer</SubType>
9490
<Generator>MSBuild:Compile</Generator>
9591
</Page>
96-
<Page Include="TextFields.xaml">
97-
<SubType>Designer</SubType>
98-
<Generator>MSBuild:Compile</Generator>
99-
</Page>
10092
<Page Include="Mah.xaml">
10193
<SubType>Designer</SubType>
10294
<Generator>MSBuild:Compile</Generator>
@@ -110,12 +102,6 @@
110102
<DependentUpon>App.xaml</DependentUpon>
111103
<SubType>Code</SubType>
112104
</Compile>
113-
<Compile Include="Buttons.xaml.cs">
114-
<DependentUpon>Buttons.xaml</DependentUpon>
115-
</Compile>
116-
<Compile Include="Cards.xaml.cs">
117-
<DependentUpon>Cards.xaml</DependentUpon>
118-
</Compile>
119105
<Compile Include="Dialogs.xaml.cs">
120106
<DependentUpon>Dialogs.xaml</DependentUpon>
121107
</Compile>
@@ -124,9 +110,6 @@
124110
<DependentUpon>FlyoutContent.xaml</DependentUpon>
125111
</Compile>
126112
<Compile Include="PaletteSelectorViewModel.cs" />
127-
<Compile Include="TextFields.xaml.cs">
128-
<DependentUpon>TextFields.xaml</DependentUpon>
129-
</Compile>
130113
<Compile Include="Mah.xaml.cs">
131114
<DependentUpon>Mah.xaml</DependentUpon>
132115
</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: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,23 @@
8585
<RowDefinition Height="Auto" />
8686
<RowDefinition Height="*" />
8787
</Grid.RowDefinitions>
88-
<StackPanel Orientation="Horizontal" Margin="8">
89-
<TextBlock VerticalAlignment="Center">Light</TextBlock>
90-
<ToggleButton Margin="8 0 16 0" Command="{Binding ToggleBaseCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}" />
91-
<TextBlock VerticalAlignment="Center">Dark</TextBlock>
92-
</StackPanel>
88+
<Grid HorizontalAlignment="Left" Margin="16 0 0 4">
89+
<Grid.RowDefinitions>
90+
<RowDefinition />
91+
<RowDefinition />
92+
</Grid.RowDefinitions>
93+
<Grid.ColumnDefinitions>
94+
<ColumnDefinition />
95+
<ColumnDefinition />
96+
<ColumnDefinition />
97+
</Grid.ColumnDefinitions>
98+
<TextBlock VerticalAlignment="Center">Standard Style</TextBlock>
99+
<ToggleButton Grid.Column="1" Margin="8 4 16 4" Command="{Binding ToggleStyleCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}" />
100+
<TextBlock Grid.Column="2" VerticalAlignment="Center">Alternate Style</TextBlock>
101+
<TextBlock Grid.Row="1" VerticalAlignment="Center">Light</TextBlock>
102+
<ToggleButton Grid.Row="1" Grid.Column="1" Margin="8 4 16 4" Command="{Binding ToggleBaseCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}" />
103+
<TextBlock Grid.Row="1" Grid.Column="2" VerticalAlignment="Center">Dark</TextBlock>
104+
</Grid>
93105
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
94106
<ItemsControl ItemsSource="{Binding Swatches, Mode=OneTime}">
95107
<ItemsControl.ItemsPanel>

0 commit comments

Comments
 (0)