Skip to content

Commit a662a2e

Browse files
committed
Merge pull request #10 from ButchersBoy/master
update from original repo
2 parents 270289b + d9fef59 commit a662a2e

File tree

122 files changed

+6793
-1427
lines changed

Some content is hidden

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

122 files changed

+6793
-1427
lines changed

.paket/paket.exe

115 KB
Binary file not shown.

CONTRIBUTING.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Contribution Guidelines
2+
3+
PRs to this project are welcome, but before contributing please bear in mind my thoughts below. If you want to get involved but are unsure, please ask (say hello in the [Gitter chat room](http://gitter.im/ButchersBoy/MaterialDesignInXamlToolkit)). Also note I wrote these guidelines several months after the library was first made available, with the benefit of hindsight. Apologies if there are inconsistencies with what you read below and what's already in the library.
4+
5+
## The purpose of this libary:
6+
7+
This is a theme library, **not** a control library. There is a subtle difference. Yes, there are some new custom controls, but their role is to specifically support either styling of existing WPF controls, or to Material Design components, as per the "Components" section in [Google's guidelines](https://www.google.com/design/spec/material-design/introduction.html).
8+
9+
The role of this library is to give users Material Design themes for standard WPF controls, and custom controls for Google specified components where no parallel exists in WPF, or where existing WPF controls cannot be sufficiently styled to meet the Google specification. Anything else is outside the scope of this library. WPF is very powerful and flexible when it comes to creating custom controls, but that doesn't mean I want to fill up this library with random controls. I want to provide the base tools and controls for Material Design, giving people a springboard to create their own controls where required.
10+
11+
In no way is this library a home for any sort of application or business logic.
12+
13+
## Coding standards:
14+
15+
I code using standard Visual Studio settings, using Resharper, and adopt (most of) ReSharper's suggestions. I'd like code to look pretty similar.
16+
17+
The API is king. If adding anything to the public interface of this library (controls, helpers etc) be mindful of the naming and usage. Don't be offended if I accept your PR but rename things slightly.
18+
19+
## UWP:
20+
21+
This whole project is a personal hobby, and this is even more true of the UWP section. I'm not accepting any PRs to UWP as I will be coding on this in my spare time, and using it as a way to learn and explore UWP for my onw enlightenment. If and when the UWP solution becomes more mature I will relax this stance.
22+
23+
## TabControl:
24+
25+
There is no TabControl style, I won't create one, and I wont accept one. I have Dragablz, and don't want the added burden of supporting two styles; even if it is fully complete. I don't want the duplication and the overhead.
26+
27+
## Submitting a PR:
28+
29+
Probably the smaller the better (within sensible bounds for the nature of your change); at least keep a single feature to a single branch/PR.

MahMaterialDragablzMashUp/App.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,4 @@
5252
</ResourceDictionary>
5353
</Application.Resources>
5454
</Application>
55+

MahMaterialDragablzMashUp/Buttons.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,28 @@
1515
</Grid.RowDefinitions>
1616
<WrapPanel Grid.Row="0" Orientation="Horizontal" Margin="0 8 0 0">
1717
<ToggleButton Style="{StaticResource MaterialDesignHamburgerToggleButton}" Margin="0 0 8 8" />
18-
<Button Style="{StaticResource MaterialDesignFloatingActionLightButton}" Margin="0 0 8 8" HorizontalAlignment="Left">
18+
<Button Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}" Margin="0 0 8 8" HorizontalAlignment="Left">
1919
<Viewbox Width="24" Height="24">
2020
<Canvas Width="24" Height="24">
2121
<Path Data="M12,20A7,7 0 0,1 5,13A7,7 0 0,1 12,6A7,7 0 0,1 19,13A7,7 0 0,1 12,20M12,4A9,9 0 0,0 3,13A9,9 0 0,0 12,22A9,9 0 0,0 21,13A9,9 0 0,0 12,4M12.5,8H11V14L15.75,16.85L16.5,15.62L12.5,13.25V8M7.88,3.39L6.6,1.86L2,5.71L3.29,7.24L7.88,3.39M22,5.72L17.4,1.86L16.11,3.39L20.71,7.25L22,5.72Z" Fill="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}, Path=Foreground}" />
2222
</Canvas>
2323
</Viewbox>
2424
</Button>
25-
<Button Style="{StaticResource MaterialDesignFloatingActionButton}" Margin="0 0 8 8" HorizontalAlignment="Left">
25+
<Button Style="{StaticResource MaterialDesignFloatingActionMiniButton}" Margin="0 0 8 8" HorizontalAlignment="Left">
2626
<Viewbox Width="24" Height="24">
2727
<Canvas Width="24" Height="24">
2828
<Path Data="M12,20A7,7 0 0,1 5,13A7,7 0 0,1 12,6A7,7 0 0,1 19,13A7,7 0 0,1 12,20M12,4A9,9 0 0,0 3,13A9,9 0 0,0 12,22A9,9 0 0,0 21,13A9,9 0 0,0 12,4M12.5,8H11V14L15.75,16.85L16.5,15.62L12.5,13.25V8M7.88,3.39L6.6,1.86L2,5.71L3.29,7.24L7.88,3.39M22,5.72L17.4,1.86L16.11,3.39L20.71,7.25L22,5.72Z" Fill="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}, Path=Foreground}" />
2929
</Canvas>
3030
</Viewbox>
3131
</Button>
32-
<Button Style="{StaticResource MaterialDesignFloatingActionDarkButton}" Margin="0 0 8 8" HorizontalAlignment="Left">
32+
<Button Style="{StaticResource MaterialDesignFloatingActionMiniDarkButton}" Margin="0 0 8 8" HorizontalAlignment="Left">
3333
<Viewbox Width="24" Height="24">
3434
<Canvas Width="24" Height="24">
3535
<Path Data="M12,20A7,7 0 0,1 5,13A7,7 0 0,1 12,6A7,7 0 0,1 19,13A7,7 0 0,1 12,20M12,4A9,9 0 0,0 3,13A9,9 0 0,0 12,22A9,9 0 0,0 21,13A9,9 0 0,0 12,4M12.5,8H11V14L15.75,16.85L16.5,15.62L12.5,13.25V8M7.88,3.39L6.6,1.86L2,5.71L3.29,7.24L7.88,3.39M22,5.72L17.4,1.86L16.11,3.39L20.71,7.25L22,5.72Z" Fill="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}, Path=Foreground}" />
3636
</Canvas>
3737
</Viewbox>
3838
</Button>
39-
<Button Style="{StaticResource MaterialDesignFloatingActionAccentButton}" Margin="0 0 8 8" HorizontalAlignment="Left">
39+
<Button Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}" Margin="0 0 8 8" HorizontalAlignment="Left">
4040
<Viewbox Width="24" Height="24">
4141
<Canvas Width="24" Height="24">
4242
<Path Data="M12,20A7,7 0 0,1 5,13A7,7 0 0,1 12,6A7,7 0 0,1 19,13A7,7 0 0,1 12,20M12,4A9,9 0 0,0 3,13A9,9 0 0,0 12,22A9,9 0 0,0 21,13A9,9 0 0,0 12,4M12.5,8H11V14L15.75,16.85L16.5,15.62L12.5,13.25V8M7.88,3.39L6.6,1.86L2,5.71L3.29,7.24L7.88,3.39M22,5.72L17.4,1.86L16.11,3.39L20.71,7.25L22,5.72Z" Fill="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}, Path=Foreground}" />

MahMaterialDragablzMashUp/Cards.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<TextBlock Text="{Binding StringFormat=m}" FontWeight="Bold" />
2626
<TextBlock Text="{Binding StringFormat=T}" />
2727
</StackPanel>
28-
<Button Style="{StaticResource MaterialDesignFloatingActionAccentButton}"
28+
<Button Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}"
2929
Grid.Column="1" Margin="-20 0 0 0" HorizontalAlignment="Left">
3030
<Viewbox Width="24" Height="24">
3131
<Canvas Width="24" Height="24">

MahMaterialDragablzMashUp/MahMaterialDragablzMashUp.csproj renamed to MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<ProjectGuid>{803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}</ProjectGuid>
88
<OutputType>WinExe</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>MahMaterialDragablzMashUp</RootNamespace>
11-
<AssemblyName>MahMaterialDragablzMashUp</AssemblyName>
10+
<RootNamespace>MahAppsDragablzDemo</RootNamespace>
11+
<AssemblyName>MahAppsDragablzDemo</AssemblyName>
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -60,10 +60,6 @@
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.1.3-ALPHA157\lib\net45\System.Windows.Interactivity.dll</HintPath>
65-
<Private>True</Private>
66-
</Reference>
6763
<Reference Include="System.Xml" />
6864
<Reference Include="Microsoft.CSharp" />
6965
<Reference Include="System.Core" />

MahMaterialDragablzMashUp/MainWindow.xaml

Lines changed: 40 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,55 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
55
xmlns:dragablz="clr-namespace:Dragablz;assembly=Dragablz"
6-
xmlns:mahMaterialDragablzMashUp="clr-namespace:MahMaterialDragablzMashUp"
6+
xmlns:mahMaterialDragablzMashUp="clr-namespace:MahMaterialDragablzMashUp"
7+
xmlns:dockablz="clr-namespace:Dragablz.Dockablz;assembly=Dragablz"
78
WindowTransitionsEnabled="False"
89
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
910
Background="{DynamicResource MaterialDesignPaper}"
1011
GlowBrush="{DynamicResource AccentColorBrush}"
11-
FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
12-
Title="Material-MahApps-Dragablz Mash Up" Height="350" Width="525">
12+
FontFamily="{StaticResource DefaultFont}"
13+
Title="Material-MahApps-Dragablz Mash Up" Height="640" Width="800">
1314
<controls:MetroWindow.Flyouts>
1415
<controls:FlyoutsControl>
1516
<controls:Flyout x:Name="LeftFlyout" Position="Left" Header="Settings">
1617
<mahMaterialDragablzMashUp:FlyoutContent />
1718
</controls:Flyout>
1819
</controls:FlyoutsControl>
1920
</controls:MetroWindow.Flyouts>
20-
<dragablz:TabablzControl TextElement.Foreground="{DynamicResource MaterialDesignBody}" BorderThickness="0"
21-
Background="{DynamicResource MaterialDesignPaper}" Margin="0,-1,0,1">
22-
<dragablz:TabablzControl.InterTabController>
23-
<dragablz:InterTabController />
24-
</dragablz:TabablzControl.InterTabController>
25-
<TabItem Header="CARDS">
26-
<mahMaterialDragablzMashUp:Cards Margin="8" />
27-
</TabItem>
28-
<TabItem Header="BUTTONS">
29-
<mahMaterialDragablzMashUp:Buttons Margin="8" />
30-
</TabItem>
31-
<TabItem Header="FIELDS">
32-
<mahMaterialDragablzMashUp:TextFields Margin="8" />
33-
</TabItem>
34-
<TabItem Header="PALETTE">
35-
<mahMaterialDragablzMashUp:PaletteSelector Margin="16">
36-
<mahMaterialDragablzMashUp:PaletteSelector.DataContext>
37-
<mahMaterialDragablzMashUp:PaletteSelectorViewModel />
38-
</mahMaterialDragablzMashUp:PaletteSelector.DataContext>
39-
</mahMaterialDragablzMashUp:PaletteSelector>
40-
</TabItem>
41-
<TabItem Header="DIALOGS">
42-
<mahMaterialDragablzMashUp:Dialogs Margin="8">
43-
<mahMaterialDragablzMashUp:Dialogs.DataContext>
44-
<mahMaterialDragablzMashUp:DialogsViewModel />
45-
</mahMaterialDragablzMashUp:Dialogs.DataContext>
46-
</mahMaterialDragablzMashUp:Dialogs>
47-
</TabItem>
48-
<TabItem Header="MAHAPPS">
49-
<mahMaterialDragablzMashUp:Mah Margin="8" />
50-
</TabItem>
51-
</dragablz:TabablzControl>
21+
<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"
25+
Margin="0,-1,0,1">
26+
<dragablz:TabablzControl.InterTabController>
27+
<dragablz:InterTabController />
28+
</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>
45+
<TabItem Header="DIALOGS">
46+
<mahMaterialDragablzMashUp:Dialogs Margin="8">
47+
<mahMaterialDragablzMashUp:Dialogs.DataContext>
48+
<mahMaterialDragablzMashUp:DialogsViewModel />
49+
</mahMaterialDragablzMashUp:Dialogs.DataContext>
50+
</mahMaterialDragablzMashUp:Dialogs>
51+
</TabItem>
52+
<TabItem Header="MAHAPPS">
53+
<mahMaterialDragablzMashUp:Mah Margin="8" />
54+
</TabItem>
55+
</dragablz:TabablzControl>
56+
</dockablz:Layout>
5257
</controls:MetroWindow>

MahMaterialDragablzMashUp/Properties/Resources.Designer.cs

Lines changed: 19 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

MahMaterialDragablzMashUp/Properties/Settings.Designer.cs

Lines changed: 10 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)