Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update MaterialDesignTheme.MahApps for MahApps v1.6.5 #898

Merged
merged 64 commits into from
Sep 5, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
1b11a38
Update paket and dependencies for MahApps.Metro v1.6
punker76 Feb 16, 2018
1b2b48a
Update nuspec dependencies
punker76 Feb 16, 2018
c424061
Update Flyout style
punker76 Feb 16, 2018
5e6ca21
Simple Grammar Corrections
matheuscuba Jul 3, 2018
a07723b
Merge pull request #978 from MatheusMCuba/patch-1
Keboo Jul 16, 2018
e161e16
Merge pull request #769 from Joris8/master
Keboo Jul 17, 2018
5e5963f
Update MaterialDesignTheme.PasswordBox.xaml
Jul 9, 2018
e93d8b3
Update MaterialDesignTheme.PasswordBox.xaml
Jul 9, 2018
aa9de13
Merge pull request #981 from LeafyDev/patch-2
Keboo Jul 19, 2018
cd2a200
Move opacitymask from grid to adornerdecorater
CookiesAndCoffee May 28, 2018
d35eafd
Merge pull request #959 from CookiesAndCoffee/FixCardShadowRender
Keboo Jul 19, 2018
93e0b91
Replaced StackPanel with Grid to enable text wrapping in DataGridColu…
mgnslndh Mar 9, 2018
a46c613
Merge pull request #910 from mgnslndh/datagridcolumnheader-wrapping
Keboo Jul 19, 2018
2d05ee8
Added Scale and Offset to the combobox template
glen-nicol Feb 17, 2018
970216f
Merge pull request #899 from glen-nicol/combobox_hint_scaling
Keboo Jul 19, 2018
53904d2
Merge pull request #894 from ahausmann/patch-1
Keboo Jul 23, 2018
3645a8a
Merge pull request #880 from redstripes89/patch-1
Keboo Jul 23, 2018
3531c41
Merge pull request #780 from Alliance-Network/GridViewColumnHeader_Thumb
Keboo Jul 23, 2018
75b7341
Merge pull request #772 from cjvaughter/master
Keboo Jul 23, 2018
fdcc324
Merge pull request #952 from Keboo/fix929
Keboo Jul 24, 2018
de9126a
Merge pull request #887 from Keboo/fix885
Keboo Jul 25, 2018
8078bd4
Merge pull request #873 from Keboo/fixCursorMissing
Keboo Jul 25, 2018
67f068a
Merge pull request #951 from Keboo/fix950
Keboo Jul 25, 2018
53b0ed8
When parent window cannot be found the paired snackbar is still avail…
Keboo May 5, 2018
16b63b3
Merge pull request #949 from Keboo/fix946
Keboo Jul 25, 2018
0cc9777
Update appveyor.yml
Keboo Jul 25, 2018
6e65a50
Remove duplicate margine from cards (#948)
Keboo Jul 25, 2018
c2b597a
Added Documentation (#991)
ChinKX Jul 25, 2018
e227821
Update README.md
Keboo Jul 26, 2018
372589a
Adding support for floating scale and floating offset on DatePicker a…
Keboo Jul 26, 2018
8f6ffc0
Update appveyor.yml
Keboo Jul 30, 2018
871ecb0
Update appveyor.yml
Keboo Jul 30, 2018
b76e8ff
Update appveyor.yml
Keboo Aug 3, 2018
8a48c61
Update appveyor.yml
Keboo Aug 3, 2018
e547951
Update appveyor.yml
Keboo Aug 3, 2018
195c535
Update appveyor.yml
Keboo Aug 3, 2018
8b1bd20
Update appveyor.yml
Keboo Aug 3, 2018
970d6a2
Update appveyor.yml
Keboo Aug 3, 2018
0753898
Update appveyor.yml
Keboo Aug 3, 2018
f8c8c81
Update appveyor.yml
Keboo Aug 3, 2018
68479f6
Update appveyor.yml
Keboo Aug 3, 2018
8f41a11
Fixing spelling mistake. (#760)
Keboo Aug 3, 2018
d559b12
Update appveyor.yml
Keboo Aug 3, 2018
a790372
Fix Button template so that ContentStringFormat works (#1002)
jcummings2 Aug 7, 2018
2f649b2
Update MaterialDesignTheme.MahApps for MahApps v1.6.5 (#1006)
ahmed-abdelrazek Aug 12, 2018
74796ae
Update MaterialDesignTheme.Button.xaml (#874)
equimal Aug 12, 2018
449ecc5
Adding attached property to control the background color of the valid…
Keboo Aug 12, 2018
c65f4ee
Added MaterialDesignUserForegroundRadioButton (same idea as MaterialD…
bebenins Aug 12, 2018
113bcca
Indeterminate Progressbar on button #961 (#964)
Streissi Aug 12, 2018
c3e2d70
Fixing issue with botched nuspec merge.
Keboo Aug 14, 2018
8306466
Added .editorconfig file using IntelliCode (#1010)
cjbush Aug 17, 2018
c0e963a
Fixes #1014
Keboo Aug 17, 2018
1bb1508
Password field box #973 (#984)
Streissi Aug 17, 2018
934e103
Fixing duplicate key
Keboo Aug 17, 2018
77155f1
Clearing hard coded headers to get localized context menus on the pas…
Keboo Aug 17, 2018
d09695c
Corrected typo for MouseMoveEventHandler method. (#1015)
dhilmathy Aug 17, 2018
59f1b93
Merge branch 'master' into feature/MahApps_v1.6
punker76 Aug 24, 2018
0d36d20
update to latest paket
punker76 Aug 24, 2018
19cfd5d
paket update
punker76 Aug 24, 2018
3b4dc35
Added ValueChanged event for RatingBar - Fixes #1027 (#1029)
dhilmathy Aug 29, 2018
ce48305
Fix the background problem on Toolbar (#1031)
hv0905 Sep 4, 2018
e02f48a
Change DashedLine default visibility to collapsed (#1019)
jizc Sep 4, 2018
c6ec165
Update RangeSlider style
punker76 Sep 4, 2018
46efaa1
Adjust MahApps Dialog stuff
punker76 Sep 4, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added .editorconfig file using IntelliCode (#1010)
  • Loading branch information
cjbush authored and punker76 committed Aug 24, 2018
commit 83064669152795441d183b2426389a9eb935ec53
97 changes: 97 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
# Rules in this file were initially inferred by Visual Studio IntelliCode from the C:\Users\bushc\Source\Repos\MaterialDesignInXamlToolkit codebase based on best match to current usage at 8/14/2018
# You can modify the rules from these initially generated values to suit your own policies
# You can learn more about editorconfig here: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
[*.cs]

#Core editorconfig formatting - indentation

#use soft tabs (spaces) for indentation
indent_style = space

#Formatting - indentation options

#indent switch case contents.
csharp_indent_case_contents = true
#indent switch labels
csharp_indent_switch_labels = true

#Formatting - new line options

#place catch statements on a new line
csharp_new_line_before_catch = true
#place else statements on a new line
csharp_new_line_before_else = true
#require braces to be on a new line for methods, accessors, anonymous_methods, types, properties, control_blocks, and lambdas (also known as "Allman" style)
csharp_new_line_before_open_brace = methods, accessors, anonymous_methods, types, properties, control_blocks, lambdas

#Formatting - organize using options

#sort System.* using directives alphabetically, and place them before other usings
dotnet_sort_system_directives_first = true

#Formatting - spacing options

#require a space before the colon for bases or interfaces in a type declaration
csharp_space_after_colon_in_inheritance_clause = true
#require a space after a keyword in a control flow statement such as a for loop
csharp_space_after_keywords_in_control_flow_statements = true
#require a space before the colon for bases or interfaces in a type declaration
csharp_space_before_colon_in_inheritance_clause = true
#remove space within empty argument list parentheses
csharp_space_between_method_call_empty_parameter_list_parentheses = false
#remove space between method call name and opening parenthesis
csharp_space_between_method_call_name_and_opening_parenthesis = false
#do not place space characters after the opening parenthesis and before the closing parenthesis of a method call
csharp_space_between_method_call_parameter_list_parentheses = false
#remove space within empty parameter list parentheses for a method declaration
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
#place a space character after the opening parenthesis and before the closing parenthesis of a method declaration parameter list.
csharp_space_between_method_declaration_parameter_list_parentheses = false

#Formatting - wrapping options

#leave code block on single line
csharp_preserve_single_line_blocks = true
#leave statements and member declarations on the same line
csharp_preserve_single_line_statements = true

#Style - expression bodied member options

#prefer block bodies for accessors
csharp_style_expression_bodied_accessors = false:suggestion
#prefer block bodies for constructors
csharp_style_expression_bodied_constructors = false:suggestion
#prefer block bodies for methods
csharp_style_expression_bodied_methods = false:suggestion
#prefer block bodies for properties
csharp_style_expression_bodied_properties = false:suggestion

#Style - expression level options

#prefer out variables to be declared before the method call
csharp_style_inlined_variable_declaration = false:suggestion
#prefer the language keyword for member access expressions, instead of the type name, for types that have a keyword to represent them
dotnet_style_predefined_type_for_member_access = true:suggestion

#Style - implicit and explicit types

#prefer var is used to declare variables with built-in system types such as int
csharp_style_var_for_built_in_types = true:suggestion
#prefer var when the type is already mentioned on the right-hand side of a declaration expression
csharp_style_var_when_type_is_apparent = true:suggestion

#Style - language keyword and framework type options

#prefer the language keyword for local variables, method parameters, and class members, instead of the type name, for types that have a keyword to represent them
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion

#Style - qualification options

#prefer events not to be prefaced with this. or Me. in Visual Basic
dotnet_style_qualification_for_event = false:suggestion
#prefer fields not to be prefaced with this. or Me. in Visual Basic
dotnet_style_qualification_for_field = false:suggestion
#prefer methods not to be prefaced with this. or Me. in Visual Basic
dotnet_style_qualification_for_method = false:suggestion
#prefer properties not to be prefaced with this. or Me. in Visual Basic
dotnet_style_qualification_for_property = false:suggestion
5 changes: 5 additions & 0 deletions MaterialDesignToolkit.Wpf.sln
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialDesignThemes.MahApp
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialDesignThemes.Wpf.Tests", "MaterialDesignThemes.Wpf.Tests\MaterialDesignThemes.Wpf.Tests.csproj", "{A361C80E-F6CD-4C57-A96C-002DB159C1F4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{55087897-5F09-45CA-8E12-12B36B45F262}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
AppVeyor|Any CPU = AppVeyor|Any CPU
Expand Down