mashup demo updates...WIP [skip ci]

Author: ButchersBoy

MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj

@@ -50,9 +50,9 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Dragablz, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Dragablz.0.0.1.109\lib\net45\Dragablz.dll</HintPath>
+    <Reference Include="Dragablz, Version=0.0.3.151, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dragablz.0.0.3.151\lib\net45\Dragablz.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="MahApps.Metro, Version=1.2.0.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
       <HintPath>..\packages\MahApps.Metro.1.2.0.0\lib\net45\MahApps.Metro.dll</HintPath>

MahMaterialDragablzMashUp/PaletteSelector.xaml

@@ -85,11 +85,23 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <StackPanel Orientation="Horizontal" Margin="8">
-            <TextBlock VerticalAlignment="Center">Light</TextBlock>
-            <ToggleButton Margin="8 0 16 0" Command="{Binding ToggleBaseCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}" />
-            <TextBlock VerticalAlignment="Center">Dark</TextBlock>
-        </StackPanel>
+        <Grid HorizontalAlignment="Left" Margin="16 0 0 4">
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <TextBlock VerticalAlignment="Center">Standard Style</TextBlock>
+            <ToggleButton Grid.Column="1" Margin="8 4 16 4" Command="{Binding ToggleBaseCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}" />
+            <TextBlock Grid.Column="2" VerticalAlignment="Center">Alternate Style</TextBlock>
+            <TextBlock Grid.Row="1" VerticalAlignment="Center">Light</TextBlock>
+            <ToggleButton Grid.Row="1" Grid.Column="1" Margin="8 0 16 0" Command="{Binding ToggleBaseCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}" />
+            <TextBlock Grid.Row="1" Grid.Column="2" VerticalAlignment="Center">Dark</TextBlock>
+        </Grid>
         <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
             <ItemsControl ItemsSource="{Binding Swatches, Mode=OneTime}">
                 <ItemsControl.ItemsPanel>

MahMaterialDragablzMashUp/PaletteSelectorViewModel.cs

@@ -12,27 +12,35 @@ public PaletteSelectorViewModel()
             Swatches = new SwatchesProvider().Swatches;
         }
 
+        public ICommand ToggleStyleCommand { get; } = new AnotherCommandImplementation(o => ApplyStyle((bool)o));
+
         public ICommand ToggleBaseCommand { get; } = new AnotherCommandImplementation(o => ApplyBase((bool)o));
 
+        public IEnumerable<Swatch> Swatches { get; }
+
+        public ICommand ApplyPrimaryCommand { get; } = new AnotherCommandImplementation(o => ApplyPrimary((Swatch)o));
+
+        public ICommand ApplyAccentCommand { get; } = new AnotherCommandImplementation(o => ApplyAccent((Swatch)o));
+
+        private void ApplyStyle(bool b)
+        {
+            throw new System.NotImplementedException();
+        }
+
         private static void ApplyBase(bool isDark)
         {
             new PaletteHelper().SetLightDark(isDark);
         }
 
-        public IEnumerable<Swatch> Swatches { get; }
-
-        public ICommand ApplyPrimaryCommand { get; } = new AnotherCommandImplementation(o => ApplyPrimary((Swatch)o));
-
         private static void ApplyPrimary(Swatch swatch)
         {
             new PaletteHelper().ReplacePrimaryColor(swatch);
         }
 
-        public ICommand ApplyAccentCommand { get; } = new AnotherCommandImplementation(o => ApplyAccent((Swatch)o));
-
         private static void ApplyAccent(Swatch swatch)
         {
             new PaletteHelper().ReplaceAccentColor(swatch);
         }
+
     }
 }

MahMaterialDragablzMashUp/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Dragablz" version="0.0.1.109" targetFramework="net45" />
+  <package id="Dragablz" version="0.0.3.151" targetFramework="net45" />
   <package id="MahApps.Metro" version="1.2.0.0" targetFramework="net45" />
 </packages>