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.

Sign up for GitHub

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

Jump to bottom

Updates MA.M font namespaces to be more uniform #3649

Merged
merged 14 commits into from
Nov 17, 2019
Merged

Updates MA.M font namespaces to be more uniform #3649

merged 14 commits into from
Nov 17, 2019

Conversation

amkuchta
Copy link
Contributor

@amkuchta amkuchta commented Oct 14, 2019 •
edited by punker76
Loading

Describe the changes you have made to improve this project

  • MA.M font namespacing was inconsistent between sizes and families
  • This commit places "MahApps.Fonts" first, followed by "Size" or "Family"
  • Further granularity is applied for specificity (e.g. "Content", "Header")
  • Items such as "DialogTitle" and "FlyoutHeader" are separated (e.g. "Dialog.Title", "Flyout.Header")
Old Font Family keys New Font Family keys
MahApps.Fonts.Default MahApps.Fonts.Family.Button
MahApps.Fonts.Header MahApps.Fonts.Family.Header
MahApps.Fonts.Family.Window.Title
MahApps.Fonts.Content MahApps.Fonts.Family.Control
MahApps.Fonts.ToggleSwitch MahApps.Fonts.Family.ToggleSwitch
MahApps.Fonts.ToggleSwitch.Header MahApps.Fonts.Family.ToggleSwitch.Header
MahApps.Fonts.ToggleSwitch.Win10 MahApps.Fonts.Family.ToggleSwitch.Win10
MahApps.Fonts.ToggleSwitch.Header.Win10 MahApps.Fonts.Family.ToggleSwitch.Header.Win10
Old Font Size keys New Font Size keys
MahApps.Sizes.Font.Header MahApps.Font.Size.Header
MahApps.Sizes.Font.SubHeader MahApps.Font.Size.SubHeader
MahApps.Sizes.Font.WindowTitle MahApps.Font.Size.Window.Title
MahApps.Sizes.Font.Normal MahApps.Font.Size.Default
MahApps.Sizes.Font.Content MahApps.Font.Size.Content
MahApps.Sizes.Font.FlatButton MahApps.Font.Size.Button.Flat
MahApps.Sizes.Font.TabItem MahApps.Font.Size.TabItem
MahApps.Sizes.Font.UpperCaseContent MahApps.Font.Size.Button
MahApps.Sizes.Font.FloatingWatermark MahApps.Font.Size.FloatingWatermark
MahApps.Sizes.Font.ClearTextButton MahApps.Font.Size.Button.ClearText
MahApps.Sizes.Font.Tooltip MahApps.Font.Size.Tooltip
MahApps.Sizes.Font.Menu MahApps.Font.Size.Menu
MahApps.Sizes.Font.ContextMenu MahApps.Font.Size.ContextMenu
MahApps.Sizes.Font.StatusBar MahApps.Font.Size.StatusBar
MahApps.Sizes.Font.DialogTitle MahApps.Font.Size.Dialog.Title
MahApps.Sizes.Font.DialogMessage MahApps.Font.Size.Dialog.Message
MahApps.Sizes.Font.DialogButton MahApps.Font.Size.Dialog.Button
MahApps.Sizes.Font.FlyoutHeader MahApps.Font.Size.Flyout.Header
MahApps.Sizes.Font.ToggleSwitch MahApps.Font.Size.ToggleSwitch
MahApps.Sizes.Font.ToggleSwitchHeader MahApps.Font.Size.ToggleSwitch.Header
MahApps.Sizes.Font.ToggleSwitch.Win10 MahApps.Font.Size.ToggleSwitch.Win10
MahApps.Sizes.Font.ToggleSwitchHeader.Win10 MahApps.Font.Size.ToggleSwitch.Header.Win10

Closed Issues

Closes #3584

@amkuchta
Copy link
Contributor Author

Just a heads up, the easiest place to view the changes is in Fonts.xaml - all changes were based on this file and propagated to the other projects and files in the solution.

@punker76 punker76 force-pushed the update/font-namespacing branch from fc37122 to 59adec0 Compare October 14, 2019 10:43
@amkuchta
Copy link
Contributor Author

@punker76 I saw that I missed converting WindowTitle to Window.Title - should I do this for consistency with the rest of the font names?

@punker76 punker76 force-pushed the update/font-namespacing branch from 59adec0 to 46e700f Compare October 15, 2019 20:25
@punker76 punker76 force-pushed the update/font-namespacing branch 3 times, most recently from e7ad60d to a1de3cf Compare October 29, 2019 15:58
@punker76 punker76 force-pushed the update/font-namespacing branch 3 times, most recently from cc0e00b to 59df5eb Compare November 8, 2019 15:58
@punker76 punker76 force-pushed the update/font-namespacing branch 2 times, most recently from 491b58a to e199118 Compare November 16, 2019 21:35
@punker76
MahApps.Fonts.Default -> MahApps.Fonts.Family.Button
fd486e8
@punker76
MahApps.Fonts.Header -> MahApps.Fonts.Family.Header, MahApps.Fonts.Fa…
359b1ff 
…mily.WindowTitle
@punker76
MahApps.Fonts.Content -> MahApps.Fonts.Family.Control
261ab63
@punker76
MahApps.Fonts.ToggleSwitch -> MahApps.Fonts.Family.ToggleSwitch
8e492fc 
MahApps.Fonts.ToggleSwitch.Header -> MahApps.Fonts.Family.ToggleSwitch.Header
MahApps.Fonts.ToggleSwitch.Win10 -> MahApps.Fonts.Family.ToggleSwitch.Win10
MahApps.Fonts.ToggleSwitch.Header.Win10 -> MahApps.Fonts.Family.ToggleSwitch.Header.Win10
@punker76
MahApps.Fonts.Family.WindowTitle -> MahApps.Fonts.Family.Window.Title
35a2605
@punker76
MahApps.Sizes.Font.XYZ -> MahApps.Font.Size.XYZ
a601cc4
@punker76
MahApps.Font.Size.WindowTitle -> MahApps.Font.Size.Window.Title
b9f1c74
@punker76
MahApps.Font.Size.FlatButton -> MahApps.Font.Size.Button.Flat
30ebbe1
@punker76
MahApps.Font.Size.UpperCaseContent -> MahApps.Font.Size.Button
f5b3a83
@punker76
MahApps.Font.Size.ClearTextButton -> MahApps.Font.Size.Button.ClearText
f7ea913
@punker76
MahApps.Font.Size.DialogXYZ -> MahApps.Font.Size.Dialog.XYZ
98b1f42
@punker76
MahApps.Font.Size.FlyoutHeader -> MahApps.Font.Size.Flyout.Header
d961855
@punker76
MahApps.Font.Size.ToggleSwitchHeader -> MahApps.Font.Size.ToggleSwitc…
7d222c2 
…h.Header
@punker76
MahApps.Font.Size.Normal -> MahApps.Font.Size.Default
e003057
@punker76 punker76 force-pushed the update/font-namespacing branch from e199118 to e003057 Compare November 17, 2019 14:19
@punker76 punker76 added this to the 2.0.0 milestone Nov 17, 2019
@punker76 punker76 merged commit 87f40c5 into MahApps:develop Nov 17, 2019
@punker76
Copy link
Member

@amkuchta your changes have been merged, thanks for your contribution 👍

@amkuchta amkuchta deleted the update/font-namespacing branch November 19, 2019 00:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Breaking Change
Milestone
2.0.0
Development

Successfully merging this pull request may close these issues.

Font Naming Convention
2 participants
@amkuchta @punker76