Skip to content

Commit 2706426

Browse files
ButchersBoyButchersBoy
committed
Merge branch 'master' into release
2 parents 8cd6cb5 + eeabdbb commit 2706426

File tree

70 files changed

+3112
-526
lines changed

Some content is hidden

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

70 files changed

+3112
-526
lines changed

‎.github/ISSUE_TEMPLATE‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# PLEASE READ BEFORE POSTING AN ISSUE
2+
13
# This is a place for issues. Questions are better asked in the Gitter chat room.
24

3-
# Seriously consider creating and linking to a test repo which takes absolutely minimal setup to illustrate how reproduce the problem.
5+
# Seriously consider creating and linking to a test repo which takes absolutely minimal setup to illustrate how reproduce the problem. My time is limited and and .Zip files, code snippets and partial examples are often a code snippet. GitHub also provides great communication and code review tools which can be utilised.
6+
7+
# HOW TO POST A GOOD SAMPLE. Follow these guidelines and I will most likely look at the issue sooner:
8+
9+
* Post a full GitHub repository. Not a zip file, half baked snippet etc. If GitHub is new to you consider it a great learning opportunity and chance to get involved.
10+
* The repository should have just ONE step max for me to get running, and that is "Restore NuGet Packages". If there are any other missing dependencies, or uncompiling features I will most likely move on to another issue.
11+
* I'm not trying to be awkward. I'm just busy and I'm helping a lot of people, not just you, so help me out and I will help you out.
12+
13+

‎.paket/paket.exe‎

336 KB
Binary file not shown.

‎LICENSE‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) James Willock, Mulholland Software and Contributors
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎License‎

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

‎MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,9 @@
166166
<Target Name="AfterBuild">
167167
</Target>
168168
-->
169+
<Import Project="..\.paket\paket.targets" />
169170
<Choose>
170-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
171+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
171172
<ItemGroup>
172173
<Reference Include="Dragablz">
173174
<HintPath>..\packages\Dragablz\lib\net45\Dragablz.dll</HintPath>
@@ -178,7 +179,7 @@
178179
</When>
179180
</Choose>
180181
<Choose>
181-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
182+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
182183
<ItemGroup>
183184
<Reference Include="MahApps.Metro">
184185
<HintPath>..\packages\MahApps.Metro\lib\net45\MahApps.Metro.dll</HintPath>
@@ -193,5 +194,4 @@
193194
</ItemGroup>
194195
</When>
195196
</Choose>
196-
<Import Project="..\.paket\paket.targets" />
197197
</Project>

‎MahMaterialDragablzMashUp/MainWindow.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns:dragablz="clr-namespace:Dragablz;assembly=Dragablz"
66
xmlns:mahMaterialDragablzMashUp="clr-namespace:MahMaterialDragablzMashUp"
77
xmlns:dockablz="clr-namespace:Dragablz.Dockablz;assembly=Dragablz"
8-
xmlns:wpf="http://materialdesigninxaml.net/winfx/xaml/themes"
8+
xmlns:wpf="http://materialdesigninxaml.net/winfx/xaml/themes"
99
WindowTransitionsEnabled="False"
1010
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
1111
Background="{DynamicResource MaterialDesignPaper}"
@@ -14,7 +14,7 @@
1414
Title="Material-MahApps-Dragablz Mash Up" Height="640" Width="800">
1515
<controls:MetroWindow.Flyouts>
1616
<controls:FlyoutsControl>
17-
<controls:Flyout x:Name="LeftFlyout" Position="Left" Header="Settings">
17+
<controls:Flyout x:Name="LeftFlyout" Position="Left" Header="Settings" wpf:FlyoutAssist.HeaderColorMode="Accent">
1818
<mahMaterialDragablzMashUp:FlyoutContent />
1919
</controls:Flyout>
2020
</controls:FlyoutsControl>

‎MainDemo.Wpf/Buttons.xaml‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@
247247
Mate
248248
</CheckBox>
249249
<CheckBox Style="{StaticResource MaterialDesignCheckBox}" Margin="0 0 8 8" VerticalAlignment="Center"
250-
IsEnabled="False">
250+
IsEnabled="False" IsChecked="True">
251251
Disabled
252252
</CheckBox>
253253
</StackPanel>
@@ -303,7 +303,29 @@
303303
</ListBoxItem>
304304
</ListBox>
305305

306-
<ListBox Grid.Column="1" Grid.Row="1" Style="{StaticResource MaterialDesignToolToggleListBox}"
306+
<ListBox Grid.Column="1" Grid.Row="1" Style="{StaticResource MaterialDesignToolToggleFlatListBox}" SelectedIndex="0">
307+
<ListBox.ToolTip>
308+
<StackPanel>
309+
<TextBlock Text="MaterialDesignToolToggleFlatListBox" />
310+
<TextBlock Text="Exclusive selection" />
311+
<TextBlock Text="ListBoxAssist.IsToggle allows more natural toggle behaviour" />
312+
</StackPanel>
313+
</ListBox.ToolTip>
314+
<ListBoxItem>
315+
<materialDesign:PackIcon Kind="FormatAlignLeft"/>
316+
</ListBoxItem>
317+
<ListBoxItem>
318+
<materialDesign:PackIcon Kind="FormatAlignCenter"/>
319+
</ListBoxItem>
320+
<ListBoxItem>
321+
<materialDesign:PackIcon Kind="FormatAlignRight"/>
322+
</ListBoxItem>
323+
<ListBoxItem>
324+
<materialDesign:PackIcon Kind="FormatAlignJustify"/>
325+
</ListBoxItem>
326+
</ListBox>
327+
328+
<ListBox Grid.Column="1" Grid.Row="2" Style="{StaticResource MaterialDesignToolToggleListBox}"
307329
SelectionMode="Extended"
308330
Margin="0 8 0 0">
309331
<ListBox.ToolTip>

‎MainDemo.Wpf/Cards.xaml‎

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,47 @@
4444
</StackPanel>
4545
</Grid>
4646
</materialDesign:Card>
47+
<materialDesign:Card Margin="4 4 0 0" Background="#03a9f4"
48+
Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
49+
Padding="0"
50+
Width="200">
51+
<Grid>
52+
<Grid.RowDefinitions>
53+
<RowDefinition Height="Auto" />
54+
<RowDefinition Height="Auto" />
55+
<RowDefinition Height="Auto" />
56+
</Grid.RowDefinitions>
57+
<TextBlock Grid.Row="0" Margin="16 16 16 4" Style="{StaticResource MaterialDesignHeadlineTextBlock}">Call Jennifer</TextBlock>
58+
<Separator Grid.Row="1" Style="{StaticResource MaterialDesignDarkSeparator}"/>
59+
<TextBlock Grid.Row="2" Margin="16 0 16 8" VerticalAlignment="Center" HorizontalAlignment="Left" Style="{StaticResource MaterialDesignBody1TextBlock}">March 19, 2016</TextBlock>
60+
<StackPanel Grid.Row="2" Orientation="Horizontal" Margin="16 0 16 8" HorizontalAlignment="Right">
61+
<Button HorizontalAlignment="Right" Style="{StaticResource MaterialDesignToolForegroundButton}" Width="30" Padding="2 0 2 0"
62+
materialDesign:RippleAssist.IsCentered="True">
63+
<materialDesign:PackIcon Kind="Phone" />
64+
</Button>
65+
</StackPanel>
66+
</Grid>
67+
</materialDesign:Card>
4768
<materialDesign:Card Margin="4 4 0 0" Background="{DynamicResource PrimaryHueLightBrush}"
4869
Foreground="{DynamicResource PrimaryHueLightForegroundBrush}"
4970
Padding="8">
5071
<TextBlock FontSize="16">Boring Text</TextBlock>
5172
</materialDesign:Card>
5273
<materialDesign:Card Margin="4 4 0 0" Background="{DynamicResource PrimaryHueDarkBrush}"
5374
Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
54-
Padding="8">
75+
>
5576
<StackPanel>
56-
<TextBlock FontSize="16">Notes</TextBlock>
57-
<CheckBox Margin="0 4 0 0" Style="{StaticResource MaterialDesignUserForegroundCheckBox}">Do something good</CheckBox>
58-
<CheckBox Style="{StaticResource MaterialDesignUserForegroundCheckBox}">Take a breather</CheckBox>
59-
<CheckBox Style="{StaticResource MaterialDesignUserForegroundCheckBox}">And go create</CheckBox>
77+
<TextBlock Margin="16 16 12 8" FontSize="16">Notes</TextBlock>
78+
<CheckBox Margin="16 4 16 0" Style="{StaticResource MaterialDesignUserForegroundCheckBox}">Do something good</CheckBox>
79+
<CheckBox Margin="16 4 16 0" Style="{StaticResource MaterialDesignUserForegroundCheckBox}">Take a breather</CheckBox>
80+
<CheckBox Margin="16 4 16 0" Style="{StaticResource MaterialDesignUserForegroundCheckBox}">And go create</CheckBox>
81+
<Separator Style="{StaticResource MaterialDesignLightSeparator}"/>
82+
<StackPanel Margin="8 0 8 8" Orientation="Horizontal" HorizontalAlignment="Right">
83+
<Button HorizontalAlignment="Right" Style="{StaticResource MaterialDesignToolForegroundButton}" Width="30" Padding="2 0 0 0"
84+
materialDesign:RippleAssist.IsCentered="True">
85+
<materialDesign:PackIcon Kind="CheckAll" />
86+
</Button>
87+
</StackPanel>
6088
</StackPanel>
6189
</materialDesign:Card>
6290
<materialDesign:Card Margin="4 4 0 0" Background="{DynamicResource PrimaryHueDarkBrush}"

0 commit comments

Comments
 (0)