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

Subsequent changes to Brushes and Colors (#3552) #3747

Merged
merged 32 commits into from Feb 26, 2020

Conversation

@punker76
Copy link
Member

punker76 commented Feb 19, 2020

Describe the changes you have made to improve this project

More subsequent changes to Brushes and Colors (caused by #3552)

Removed brushes
  • MahApps.Brushes.CheckBox.Background
  • MahApps.Brushes.DisabledWhite
  • MahApps.Brushes.TextBox.MouseOverInnerBorder
  • MahApps.Brushes.Button.MouseOverInnerBorder
  • MahApps.Brushes.ComboBox.MouseOverInnerBorder
  • MahApps.Brushes.WhiteColor, use MahApps.Brushes.White instead
  • MahApps.Brushes.BlackColor, use MahApps.Brushes.Black instead
  • MahApps.Brushes.Label.Text, use MahApps.Brushes.Text instead
  • MahApps.Brushes.DarkIdealForegroundDisabled
  • MahApps.Brushes.ToggleSwitchButton.Pressed.Win10
  • MahApps.Brushes.ToggleSwitchButton.OffBorder.Win10
  • MahApps.Brushes.ToggleSwitchButton.OffMouseOverBorder.Win10
  • MahApps.Brushes.ToggleSwitchButton.OffDisabledBorder.Win10
  • MahApps.Brushes.ToggleSwitchButton.OffSwitch.Win10
  • MahApps.Brushes.ToggleSwitchButton.OnSwitch.Win10
  • MahApps.Brushes.ToggleSwitchButton.OnSwitchDisabled.Win10
  • MahApps.Brushes.ToggleSwitchButton.OnSwitchMouseOver.Win10
  • MahApps.Brushes.ToggleSwitchButton.ThumbIndicator.Win10
  • MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOver.Win10
  • MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorChecked.Win10
  • MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorPressed.Win10
  • MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorDisabled.Win10
New colors
  • MahApps.Colors.Button.Flat.Foreground.Pressed
  • MahApps.Colors.Gray.SemiTransparent
  • MahApps.Colors.SemiTransparent
  • MahApps.Colors.Badged.Foreground.Disabled
New brushes
  • MahApps.Brushes.Button.Border
  • MahApps.Brushes.Button.Border.Focus
  • MahApps.Brushes.Button.Flat.Background.MouseOver
  • MahApps.Brushes.Button.CleanWindow.Close.Foreground.MouseOver
  • MahApps.Brushes.Button.Square.Background.MouseOver
  • MahApps.Brushes.Button.Square.Foreground.MouseOver
  • MahApps.Brushes.Button.AccentedSquare.Background.MouseOver
  • MahApps.Brushes.Button.AccentedSquare.Foreground.MouseOver
  • MahApps.Brushes.DataGrid.Selection.Text.Disabled
  • MahApps.Brushes.DataGrid.Selection.BorderBrush
  • MahApps.Brushes.DataGrid.Selection.BorderBrush.Disabled
  • MahApps.Brushes.DataGrid.Selection.BorderBrush.MouseOver
  • MahApps.Brushes.DataGrid.Selection.BorderBrush.Inactive
  • MahApps.Brushes.Badged.BackgroundMahApps.Brushes.Badged.Background
  • MahApps.Brushes.Badged.Foreground
  • MahApps.Brushes.Badged.Foreground.Disabled
  • MahApps.Brushes.ToggleSwitch.ContentForeground
  • MahApps.Brushes.ToggleSwitch.ContentForegroundDisabled
  • MahApps.Brushes.ToggleSwitch.HeaderForeground
  • MahApps.Brushes.ToggleSwitch.HeaderForegroundDisabled
  • MahApps.Brushes.ToggleSwitch.ContainerBackground
  • MahApps.Brushes.ToggleSwitch.ContainerBackgroundPointerOver
  • MahApps.Brushes.ToggleSwitch.ContainerBackgroundPressed
  • MahApps.Brushes.ToggleSwitch.ContainerBackgroundDisabled
  • MahApps.Brushes.ToggleSwitch.FillOff
  • MahApps.Brushes.ToggleSwitch.FillOffPointerOver
  • MahApps.Brushes.ToggleSwitch.FillOffPressed
  • MahApps.Brushes.ToggleSwitch.FillOffDisabled
  • MahApps.Brushes.ToggleSwitch.StrokeOff
  • MahApps.Brushes.ToggleSwitch.StrokeOffPointerOver
  • MahApps.Brushes.ToggleSwitch.StrokeOffPressed
  • MahApps.Brushes.ToggleSwitch.StrokeOffDisabled
  • MahApps.Brushes.ToggleSwitch.FillOn
  • MahApps.Brushes.ToggleSwitch.FillOnPointerOver
  • MahApps.Brushes.ToggleSwitch.FillOnPressed
  • MahApps.Brushes.ToggleSwitch.FillOnDisabled
  • MahApps.Brushes.ToggleSwitch.StrokeOn
  • MahApps.Brushes.ToggleSwitch.StrokeOnPointerOver
  • MahApps.Brushes.ToggleSwitch.StrokeOnPressed
  • MahApps.Brushes.ToggleSwitch.StrokeOnDisabled
  • MahApps.Brushes.ToggleSwitch.KnobFillOff
  • MahApps.Brushes.ToggleSwitch.KnobFillOffPointerOver
  • MahApps.Brushes.ToggleSwitch.KnobFillOffPressed
  • MahApps.Brushes.ToggleSwitch.KnobFillOffDisabled
  • MahApps.Brushes.ToggleSwitch.KnobFillOn
  • MahApps.Brushes.ToggleSwitch.KnobFillOnPointerOver
  • MahApps.Brushes.ToggleSwitch.KnobFillOnPressed
  • MahApps.Brushes.ToggleSwitch.KnobFillOnDisabled
Renamed colors
Old key New key
MahApps.Colors.Black MahApps.Colors.ThemeForeground
MahApps.Colors.White MahApps.Colors.ThemeBackground
MahApps.Colors.FlatButton.PressedBackground MahApps.Colors.Button.Flat.Background.Pressed
MahApps.Colors.GrayNormal MahApps.Colors.Gray
MahApps.Colors.GrayHover MahApps.Colors.Gray.MouseOver
MahApps.Colors.Badged.DisabledBackground MahApps.Colors.Badged.Background.Disabled
Renamed brushes
Old key New key
MahApps.Brushes.Black MahApps.Brushes.ThemeForeground
MahApps.Brushes.White MahApps.Brushes.ThemeBackground
MahApps.Brushes.Controls.Disabled MahApps.Brushes.Control.Disabled
MahApps.Brushes.Controls.Border MahApps.Brushes.Control.Border
MahApps.Brushes.Controls.Validation MahApps.Brushes.Control.Validation
MahApps.Brushes.TextBox.MouseOverBorder MahApps.Brushes.TextBox.Border.MouseOver
MahApps.Brushes.TextBox.FocusBorder MahApps.Brushes.TextBox.Border.Focus
MahApps.Brushes.Button.MouseOverBorder MahApps.Brushes.Button.Border.MouseOver
MahApps.Brushes.ComboBox.MouseOverBorder MahApps.Brushes.ComboBox.Border.MouseOver
MahApps.Brushes.ComboBox.FocusBorder MahApps.Brushes.ComboBox.Border.Focus
MahApps.Brushes.FlatButton.Background MahApps.Brushes.Button.Flat.Background
MahApps.Brushes.FlatButton.Foreground MahApps.Brushes.Button.Flat.Foreground
MahApps.Brushes.FlatButton.PressedBackground MahApps.Brushes.Button.Flat.Background.Pressed
MahApps.Brushes.FlatButton.PressedForeground MahApps.Brushes.Button.Flat.Foreground.Pressed
MahApps.Brushes.WindowButtonCommands.HoverBackground MahApps.Brushes.WindowButtonCommands.Background.MouseOver
MahApps.Brushes.CleanWindowCloseButton.Background MahApps.Brushes.Button.CleanWindow.Close.Background.MouseOver
MahApps.Brushes.CleanWindowCloseButton.PressedBackground MahApps.Brushes.Button.CleanWindow.Close.Background.Pressed
MahApps.Brushes.AccentSelectedColor MahApps.Brushes.Selected.Foreground
MahApps.Brushes.MenuItem.DisabledForeground MahApps.Brushes.MenuItem.Foreground.Disabled
MahApps.Brushes.MenuItem.DisabledGlyphPanel MahApps.Brushes.MenuItem.GlyphPanel.Disabled
MahApps.Brushes.GrayNormal MahApps.Brushes.Gray
MahApps.Brushes.GrayHover MahApps.Brushes.Gray.MouseOver
MahApps.Brushes.SemiTransparentGray MahApps.Brushes.Gray.SemiTransparent
MahApps.Brushes.TransparentWhite MahApps.Brushes.Transparent
MahApps.Brushes.SemiTransparentWhite MahApps.Brushes.SemiTransparent
MahApps.Brushes.DataGrid.Highlight MahApps.Brushes.DataGrid.Selection.Background
MahApps.Brushes.DataGrid.DisabledHighlight MahApps.Brushes.DataGrid.Selection.Background.Disabled
MahApps.Brushes.DataGrid.HighlightText MahApps.Brushes.DataGrid.Selection.Text
MahApps.Brushes.DataGrid.MouseOverHighlight MahApps.Brushes.DataGrid.Selection.Background.MouseOver
MahApps.Brushes.DataGrid.FocusBorder MahApps.Brushes.DataGrid.Selection.BorderBrush.Focus
MahApps.Brushes.DataGrid.InactiveSelectionHighlight MahApps.Brushes.DataGrid.Selection.Background.Inactive
MahApps.Brushes.DataGrid.InactiveSelectionHighlightText MahApps.Brushes.DataGrid.Selection.Text.Inactive
MahApps.Brushes.Badged.DisabledBackground MahApps.Brushes.Badged.Background.Disabled
MahApps.HamburgerMenu.PaneBackground MahApps.HamburgerMenu.Pane.Background
MahApps.HamburgerMenu.PaneForeground MahApps.HamburgerMenu.Pane.Foreground
  • Fix wrong brushes at MahApps.Styles.CheckBox

Closes #3585

punker76 added 16 commits Feb 13, 2020
…ushes.White
…ushes.Black
- Rename MahApps.Colors.Black to MahApps.Colors.ThemeForeground
- Rename MahApps.Colors.White to MahApps.Colors.ThemeBackground
- Rename MahApps.Brushes.Black to MahApps.Brushes.ThemeForeground
- Rename MahApps.Brushes.White to MahApps.Brushes.ThemeBackground
…isabled
….Validation
…tBox.Border.MouseOver
….Border.Focus
…on.Border.MouseOver
…mboBox.Border.MouseOver
…Border.Focus
@punker76 punker76 added this to the 2.0.0 milestone Feb 19, 2020
punker76 added 12 commits Feb 19, 2020
- New color MahApps.Colors.Button.Flat.Foreground.Pressed
- Rename MahApps.Colors.FlatButton.PressedBackground to MahApps.Colors.Button.Flat.Background.Pressed
- Rename MahApps.Brushes.FlatButton.Background to MahApps.Brushes.Button.Flat.Background
- Rename MahApps.Brushes.FlatButton.Foreground to MahApps.Brushes.Button.Flat.Foreground
- Rename MahApps.Brushes.FlatButton.PressedBackground to MahApps.Brushes.Button.Flat.Background.Pressed
- Rename MahApps.Brushes.FlatButton.PressedForeground
- New brush MahApps.Brushes.Button.Flat.MouseOver to MahApps.Brushes.Button.Flat.Foreground.Pressed
…ox.Border.Focus
…s.Brushes.WindowButtonCommands.Background.MouseOver
- Rename MahApps.Brushes.CleanWindowCloseButton.Background to MahApps.Brushes.Button.CleanWindow.Close.Background.MouseOver
- Rename MahApps.Brushes.CleanWindowCloseButton.PressedBackground to MahApps.Brushes.Button.CleanWindow.Close.Background.Pressed
- New brush MahApps.Brushes.Button.CleanWindow.Close.Foreground.MouseOver
…d.Foreground
- New brush MahApps.Brushes.Button.Square.Background.MouseOver
- New brush MahApps.Brushes.Button.Square.Foreground.MouseOver
- New brush MahApps.Brushes.Button.AccentedSquare.Background.MouseOver
- New brush MahApps.Brushes.Button.AccentedSquare.Foreground.MouseOver
- Rename MahApps.Brushes.MenuItem.DisabledForeground to MahApps.Brushes.MenuItem.Foreground.Disabled
- Rename MahApps.Brushes.MenuItem.DisabledGlyphPanel to MahApps.Brushes.MenuItem.GlyphPanel.Disabled
- Rename MahApps.Colors.GrayNormal to MahApps.Colors.Gray
- Rename MahApps.Colors.GrayHover to MahApps.Colors.Gray.MouseOver
- New color MahApps.Colors.Gray.SemiTransparent
- Rename MahApps.Brushes.GrayNormal to MahApps.Brushes.Gray
- Rename MahApps.Brushes.GrayHover to MahApps.Brushes.Gray.MouseOver
- Rename MahApps.Brushes.SemiTransparentGray to  MahApps.Brushes.Gray.SemiTransparent
- Rename MahApps.Brushes.TransparentWhite to MahApps.Brushes.Transparent
- Rename MahApps.Brushes.SemiTransparentWhite to MahApps.Brushes.SemiTransparent
- New color MahApps.Colors.SemiTransparent
- Rename MahApps.Brushes.DataGrid.Highlight to MahApps.Brushes.DataGrid.Selection.Background
- Rename MahApps.Brushes.DataGrid.DisabledHighlight to MahApps.Brushes.DataGrid.Selection.Background.Disabled
- Rename MahApps.Brushes.DataGrid.HighlightText to MahApps.Brushes.DataGrid.Selection.Text
- Rename MahApps.Brushes.DataGrid.MouseOverHighlight to MahApps.Brushes.DataGrid.Selection.Background.MouseOver
- Rename MahApps.Brushes.DataGrid.FocusBorder to MahApps.Brushes.DataGrid.Selection.BorderBrush.Focus
- Rename MahApps.Brushes.DataGrid.InactiveSelectionHighlight to MahApps.Brushes.DataGrid.Selection.Background.Inactive
- Rename MahApps.Brushes.DataGrid.InactiveSelectionHighlightText to MahApps.Brushes.DataGrid.Selection.Text.Inactive

- New brush MahApps.Brushes.DataGrid.Selection.Text.Disabled
- New brush MahApps.Brushes.DataGrid.Selection.BorderBrush
- New brush MahApps.Brushes.DataGrid.Selection.BorderBrush.Disabled
- New brush MahApps.Brushes.DataGrid.Selection.BorderBrush.MouseOver
- New brush MahApps.Brushes.DataGrid.Selection.BorderBrush.Inactive
- Rename MahApps.Brushes.Badged.DisabledBackground to MahApps.Brushes.Badged.Background.Disabled
- Rename MahApps.Colors.Badged.DisabledBackground to MahApps.Colors.Badged.Background.Disabled
- New brush MahApps.Brushes.Badged.BackgroundMahApps.Brushes.Badged.Background
- New brush MahApps.Brushes.Badged.Foreground
- New brush MahApps.Brushes.Badged.Foreground.Disabled
- New color MahApps.Colors.Badged.Foreground.Disabled
punker76 added 4 commits Feb 23, 2020
- Rename MahApps.HamburgerMenu.PaneBackground to MahApps.HamburgerMenu.Pane.Background
- Rename MahApps.HamburgerMenu.PaneForegroundto MahApps.HamburgerMenu.Pane.Foreground
- Remove MahApps.Brushes.ToggleSwitchButton.Pressed.Win10
- Remove MahApps.Brushes.ToggleSwitchButton.OffBorder.Win10
- Remove MahApps.Brushes.ToggleSwitchButton.OffMouseOverBorder.Win10
- Remove MahApps.Brushes.ToggleSwitchButton.OffDisabledBorder.Win10
- Remove MahApps.Brushes.ToggleSwitchButton.OffSwitch.Win10
- Remove MahApps.Brushes.ToggleSwitchButton.OnSwitch.Win10
- Remove MahApps.Brushes.ToggleSwitchButton.OnSwitchDisabled.Win10
- Remove MahApps.Brushes.ToggleSwitchButton.OnSwitchMouseOver.Win10
- Remove MahApps.Brushes.ToggleSwitchButton.ThumbIndicator.Win10
- Remove MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOver.Win10
- Remove MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorChecked.Win10
- Remove MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorPressed.Win10
- Remove MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorDisabled.Win10

- New brush MahApps.Brushes.ToggleSwitch.ContentForeground
- New brush MahApps.Brushes.ToggleSwitch.ContentForegroundDisabled
- New brush MahApps.Brushes.ToggleSwitch.HeaderForeground
- New brush MahApps.Brushes.ToggleSwitch.HeaderForegroundDisabled
- New brush MahApps.Brushes.ToggleSwitch.ContainerBackground
- New brush MahApps.Brushes.ToggleSwitch.ContainerBackgroundPointerOver
- New brush MahApps.Brushes.ToggleSwitch.ContainerBackgroundPressed
- New brush MahApps.Brushes.ToggleSwitch.ContainerBackgroundDisabled
- New brush MahApps.Brushes.ToggleSwitch.FillOff
- New brush MahApps.Brushes.ToggleSwitch.FillOffPointerOver
- New brush MahApps.Brushes.ToggleSwitch.FillOffPressed
- New brush MahApps.Brushes.ToggleSwitch.FillOffDisabled
- New brush MahApps.Brushes.ToggleSwitch.StrokeOff
- New brush MahApps.Brushes.ToggleSwitch.StrokeOffPointerOver
- New brush MahApps.Brushes.ToggleSwitch.StrokeOffPressed
- New brush MahApps.Brushes.ToggleSwitch.StrokeOffDisabled
- New brush MahApps.Brushes.ToggleSwitch.FillOn
- New brush MahApps.Brushes.ToggleSwitch.FillOnPointerOver
- New brush MahApps.Brushes.ToggleSwitch.FillOnPressed
- New brush MahApps.Brushes.ToggleSwitch.FillOnDisabled
- New brush MahApps.Brushes.ToggleSwitch.StrokeOn
- New brush MahApps.Brushes.ToggleSwitch.StrokeOnPointerOver
- New brush MahApps.Brushes.ToggleSwitch.StrokeOnPressed
- New brush MahApps.Brushes.ToggleSwitch.StrokeOnDisabled
- New brush MahApps.Brushes.ToggleSwitch.KnobFillOff
- New brush MahApps.Brushes.ToggleSwitch.KnobFillOffPointerOver
- New brush MahApps.Brushes.ToggleSwitch.KnobFillOffPressed
- New brush MahApps.Brushes.ToggleSwitch.KnobFillOffDisabled
- New brush MahApps.Brushes.ToggleSwitch.KnobFillOn
- New brush MahApps.Brushes.ToggleSwitch.KnobFillOnPointerOver
- New brush MahApps.Brushes.ToggleSwitch.KnobFillOnPressed
- New brush MahApps.Brushes.ToggleSwitch.KnobFillOnDisabled
ToggleSwitch Content Presenters
@punker76 punker76 changed the title WIP Subsequent changes to Brushes and Colors (#3552) Subsequent changes to Brushes and Colors (#3552) Feb 26, 2020
@punker76 punker76 merged commit 00c221b into develop Feb 26, 2020
3 checks passed
3 checks passed
Codacy/PR Quality Review Up to standards. A positive pull request.
Details
WIP Ready for review
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
@punker76 punker76 deleted the feature/Brushes-Colors-#3552 branch Feb 26, 2020
@Keboo Keboo mentioned this pull request Mar 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

1 participant
You can’t perform that action at this time.