Skip to content

Commit

Permalink
Steel: some improvements to disabled styles
Browse files Browse the repository at this point in the history
  • Loading branch information
@joshtynjala
joshtynjala committed Feb 28, 2024
1 parent 03b8e36 commit 8ad68da
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 10 deletions.
6 changes: 5 additions & 1 deletion src/feathers/themes/steel/BaseSteelTheme.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ class BaseSteelTheme extends ClassVariantTheme implements IDarkModeTheme {
}

private function getButtonDisabledFill():FillStyle {
return SolidColor(this.controlDisabledFillColor, 0.7);
return SolidColor(this.controlDisabledFillColor);
}

private function getScrollBarThumbFill():FillStyle {
Expand All @@ -305,6 +305,10 @@ class BaseSteelTheme extends ClassVariantTheme implements IDarkModeTheme {
return SolidColor(thickness, this.borderColor);
}

private function getButtonDisabledBorder(thickness:Float = 1.0):LineStyle {
return SolidColor(thickness, this.disabledInsetBorderColor);
}

private function getInsetBorder(thickness:Float = 1.0):LineStyle {
return SolidColor(thickness, this.insetBorderColor);
}
Expand Down
5 changes: 3 additions & 2 deletions src/feathers/themes/steel/components/SteelButtonStyles.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class SteelButtonStyles {
skin.disabledFill = theme.getButtonDisabledFill();
skin.setFillForState(DOWN, theme.getReversedActiveThemeFill());
skin.border = theme.getButtonBorder();
skin.disabledBorder = theme.getButtonDisabledBorder();
skin.setBorderForState(DOWN, theme.getActiveFillBorder());
skin.cornerRadius = 3.0;
button.backgroundSkin = skin;
Expand Down Expand Up @@ -74,7 +75,7 @@ class SteelButtonStyles {
skin.disabledFill = theme.getButtonDisabledFill();
skin.setFillForState(DOWN, theme.getReversedActiveThemeFill());
skin.border = theme.getActiveFillBorder();
skin.disabledBorder = theme.getButtonBorder();
skin.disabledBorder = theme.getButtonDisabledBorder();
skin.cornerRadius = 3.0;
button.backgroundSkin = skin;
}
Expand Down Expand Up @@ -109,7 +110,7 @@ class SteelButtonStyles {
skin.disabledFill = theme.getButtonDisabledFill();
skin.setFillForState(DOWN, theme.getReversedDangerFill());
skin.border = theme.getDangerBorder();
skin.disabledBorder = theme.getButtonBorder();
skin.disabledBorder = theme.getButtonDisabledBorder();
skin.cornerRadius = 3.0;
button.backgroundSkin = skin;
}
Expand Down
4 changes: 3 additions & 1 deletion src/feathers/themes/steel/components/SteelComboBoxStyles.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ class SteelComboBoxStyles {
skin.disabledFill = theme.getButtonDisabledFill();
skin.setFillForState(ButtonState.DOWN, theme.getReversedActiveThemeFill());
skin.border = theme.getButtonBorder();
skin.disabledBorder = theme.getButtonDisabledBorder();
skin.setBorderForState(ButtonState.DOWN, theme.getActiveFillBorder());
skin.cornerRadius = 3.0;
button.backgroundSkin = skin;
Expand Down Expand Up @@ -78,8 +79,9 @@ class SteelComboBoxStyles {
inputSkin.drawBaseBorder = false;
inputSkin.width = 160.0;
inputSkin.fill = theme.getInsetFill();
inputSkin.border = theme.getInsetBorder();
inputSkin.disabledFill = theme.getDisabledInsetFill();
inputSkin.border = theme.getInsetBorder();
inputSkin.disabledBorder = theme.getDisabledInsetBorder();
inputSkin.setBorderForState(TextInputState.FOCUSED, theme.getThemeBorder());
input.backgroundSkin = inputSkin;
}
Expand Down
4 changes: 4 additions & 0 deletions src/feathers/themes/steel/components/SteelDatePickerStyles.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ class SteelDatePickerStyles {
skin.setFillForState(ButtonState.DOWN, theme.getReversedActiveThemeFill());
skin.setFillForState(ButtonState.DISABLED, theme.getButtonDisabledFill());
skin.border = theme.getButtonBorder();
skin.disabledBorder = theme.getButtonDisabledBorder();
skin.setBorderForState(ButtonState.DOWN, theme.getActiveFillBorder());
skin.cornerRadius = 3.0;
if (isDesktop) {
Expand Down Expand Up @@ -117,6 +118,7 @@ class SteelDatePickerStyles {
skin.setFillForState(ButtonState.DOWN, theme.getReversedActiveThemeFill());
skin.setFillForState(ButtonState.DISABLED, theme.getButtonDisabledFill());
skin.border = theme.getButtonBorder();
skin.disabledBorder = theme.getButtonDisabledBorder();
skin.setBorderForState(ButtonState.DOWN, theme.getActiveFillBorder());
skin.cornerRadius = 3.0;
if (isDesktop) {
Expand Down Expand Up @@ -154,6 +156,7 @@ class SteelDatePickerStyles {
skin.setFillForState(ButtonState.DOWN, theme.getReversedActiveThemeFill());
skin.setFillForState(ButtonState.DISABLED, theme.getButtonDisabledFill());
skin.border = theme.getButtonBorder();
skin.disabledBorder = theme.getButtonDisabledBorder();
skin.setBorderForState(ButtonState.DOWN, theme.getActiveFillBorder());
skin.cornerRadius = 3.0;
if (isDesktop) {
Expand Down Expand Up @@ -191,6 +194,7 @@ class SteelDatePickerStyles {
skin.setFillForState(ButtonState.DOWN, theme.getReversedActiveThemeFill());
skin.setFillForState(ButtonState.DISABLED, theme.getButtonDisabledFill());
skin.border = theme.getButtonBorder();
skin.disabledBorder = theme.getButtonDisabledBorder();
skin.setBorderForState(ButtonState.DOWN, theme.getActiveFillBorder());
skin.cornerRadius = 3.0;
if (isDesktop) {
Expand Down
9 changes: 7 additions & 2 deletions src/feathers/themes/steel/components/SteelHSliderStyles.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@ class SteelHSliderStyles {

var backgroundSkin = new CircleSkin();
backgroundSkin.fill = theme.getButtonFill();
backgroundSkin.border = theme.getButtonBorder();
backgroundSkin.disabledFill = theme.getButtonDisabledFill();
backgroundSkin.setFillForState(ButtonState.DOWN, theme.getButtonDownFill());
backgroundSkin.setFillForState(ButtonState.DISABLED, theme.getButtonDisabledFill());
backgroundSkin.border = theme.getButtonBorder();
backgroundSkin.disabledBorder = theme.getButtonDisabledBorder();
backgroundSkin.width = 24.0;
backgroundSkin.height = 24.0;
thumb.backgroundSkin = backgroundSkin;
Expand All @@ -60,7 +61,9 @@ class SteelHSliderStyles {
if (slider.trackSkin == null) {
var trackSkin = new TabSkin();
trackSkin.fill = theme.getActiveThemeFill();
trackSkin.disabledFill = theme.getControlDisabledFill();
trackSkin.border = theme.getActiveFillBorder();
trackSkin.disabledBorder = theme.getDisabledInsetBorder();
trackSkin.cornerRadius = 8.0;
trackSkin.cornerRadiusPosition = LEFT;
trackSkin.width = 100.0;
Expand All @@ -72,7 +75,9 @@ class SteelHSliderStyles {
if (slider.secondaryTrackSkin == null) {
var secondaryTrackSkin = new TabSkin();
secondaryTrackSkin.fill = theme.getInsetFill();
secondaryTrackSkin.disabledFill = theme.getDisabledInsetFill();
secondaryTrackSkin.border = theme.getInsetBorder();
secondaryTrackSkin.disabledBorder = theme.getDisabledInsetBorder();
secondaryTrackSkin.cornerRadius = 8.0;
secondaryTrackSkin.cornerRadiusPosition = RIGHT;
secondaryTrackSkin.width = 100.0;
Expand Down
5 changes: 4 additions & 1 deletion src/feathers/themes/steel/components/SteelNumericStepperStyles.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ class SteelNumericStepperStyles {
skin.disabledFill = theme.getButtonDisabledFill();
skin.setFillForState(ButtonState.DOWN, theme.getReversedActiveThemeFill());
skin.border = theme.getButtonBorder();
skin.disabledBorder = theme.getButtonDisabledBorder();
skin.setBorderForState(ButtonState.DOWN, theme.getActiveFillBorder());
skin.cornerRadius = 3.0;
button.backgroundSkin = skin;
Expand Down Expand Up @@ -76,6 +77,7 @@ class SteelNumericStepperStyles {
skin.disabledFill = theme.getButtonDisabledFill();
skin.setFillForState(ButtonState.DOWN, theme.getReversedActiveThemeFill());
skin.border = theme.getButtonBorder();
skin.disabledBorder = theme.getButtonDisabledBorder();
skin.setBorderForState(ButtonState.DOWN, theme.getActiveFillBorder());
skin.cornerRadius = 3.0;
button.backgroundSkin = skin;
Expand All @@ -102,8 +104,9 @@ class SteelNumericStepperStyles {
var inputSkin = new RectangleSkin();
inputSkin.width = 3.0;
inputSkin.fill = theme.getInsetFill();
inputSkin.border = theme.getInsetBorder();
inputSkin.disabledFill = theme.getDisabledInsetFill();
inputSkin.border = theme.getInsetBorder();
inputSkin.disabledBorder = theme.getDisabledInsetBorder();
inputSkin.setBorderForState(TextInputState.FOCUSED, theme.getThemeBorder());
input.backgroundSkin = inputSkin;
}
Expand Down
1 change: 1 addition & 0 deletions src/feathers/themes/steel/components/SteelPageIndicatorStyles.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ class SteelPageIndicatorStyles {
skin.setFillForState(ToggleButtonState.DOWN(false), theme.getReversedActiveThemeFill());
skin.setFillForState(ToggleButtonState.DOWN(false), theme.getReversedActiveThemeFill());
skin.border = theme.getButtonBorder();
skin.disabledBorder = theme.getButtonDisabledBorder();
skin.selectedBorder = theme.getSelectedInsetBorder();
skin.setBorderForState(ToggleButtonState.DOWN(false), theme.getActiveFillBorder());
skin.minWidth = 10.0;
Expand Down
2 changes: 2 additions & 0 deletions src/feathers/themes/steel/components/SteelPopUpDatePickerStyles.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ class SteelPopUpDatePickerStyles {
skin.disabledFill = theme.getButtonDisabledFill();
skin.setFillForState(ButtonState.DOWN, theme.getReversedActiveThemeFill());
skin.border = theme.getButtonBorder();
skin.disabledBorder = theme.getButtonDisabledBorder();
skin.setBorderForState(ButtonState.DOWN, theme.getActiveFillBorder());
skin.cornerRadius = 3.0;
button.backgroundSkin = skin;
Expand Down Expand Up @@ -81,6 +82,7 @@ class SteelPopUpDatePickerStyles {
inputSkin.fill = theme.getInsetFill();
inputSkin.disabledFill = theme.getDisabledInsetFill();
inputSkin.border = theme.getInsetBorder();
inputSkin.disabledBorder = theme.getDisabledInsetBorder();
inputSkin.setBorderForState(TextInputState.FOCUSED, theme.getThemeBorder());
input.backgroundSkin = inputSkin;
}
Expand Down
1 change: 1 addition & 0 deletions src/feathers/themes/steel/components/SteelTabBarStyles.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ class SteelTabBarStyles {
skin.setFillForState(ToggleButtonState.DOWN(false), theme.getReversedActiveThemeFill());
skin.setFillForState(ToggleButtonState.DOWN(false), theme.getReversedActiveThemeFill());
skin.border = theme.getButtonBorder();
skin.disabledBorder = theme.getButtonDisabledBorder();
skin.selectedBorder = theme.getActiveFillBorder();
skin.setBorderForState(ToggleButtonState.DOWN(false), theme.getActiveFillBorder());
button.backgroundSkin = skin;
Expand Down
2 changes: 1 addition & 1 deletion src/feathers/themes/steel/components/SteelToggleButtonStyles.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class SteelToggleButtonStyles {
skin.setFillForState(DOWN(false), theme.getReversedActiveThemeFill());
skin.border = theme.getButtonBorder();
skin.selectedBorder = theme.getSelectedBorder();
skin.disabledBorder = theme.getButtonBorder();
skin.disabledBorder = theme.getButtonDisabledBorder();
skin.setBorderForState(DOWN(false), theme.getActiveFillBorder());
skin.setBorderForState(DOWN(true), theme.getActiveFillBorder());
skin.cornerRadius = 3.0;
Expand Down
9 changes: 7 additions & 2 deletions src/feathers/themes/steel/components/SteelVSliderStyles.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@ class SteelVSliderStyles {

var backgroundSkin = new CircleSkin();
backgroundSkin.fill = theme.getButtonFill();
backgroundSkin.border = theme.getButtonBorder();
backgroundSkin.disabledFill = theme.getButtonDisabledFill();
backgroundSkin.setFillForState(ButtonState.DOWN, theme.getButtonDownFill());
backgroundSkin.setFillForState(ButtonState.DISABLED, theme.getButtonDisabledFill());
backgroundSkin.border = theme.getButtonBorder();
backgroundSkin.disabledBorder = theme.getButtonDisabledBorder();
backgroundSkin.width = 24.0;
backgroundSkin.height = 24.0;
thumb.backgroundSkin = backgroundSkin;
Expand All @@ -60,7 +61,9 @@ class SteelVSliderStyles {
if (slider.trackSkin == null) {
var trackSkin = new TabSkin();
trackSkin.fill = theme.getActiveThemeFill();
trackSkin.disabledFill = theme.getControlDisabledFill();
trackSkin.border = theme.getActiveFillBorder();
trackSkin.disabledBorder = theme.getDisabledInsetBorder();
trackSkin.cornerRadius = 8.0;
trackSkin.cornerRadiusPosition = BOTTOM;
trackSkin.width = 8.0;
Expand All @@ -72,7 +75,9 @@ class SteelVSliderStyles {
if (slider.secondaryTrackSkin == null) {
var secondaryTrackSkin = new TabSkin();
secondaryTrackSkin.fill = theme.getInsetFill();
secondaryTrackSkin.disabledFill = theme.getDisabledInsetFill();
secondaryTrackSkin.border = theme.getInsetBorder();
secondaryTrackSkin.disabledBorder = theme.getDisabledInsetBorder();
secondaryTrackSkin.cornerRadius = 8.0;
secondaryTrackSkin.cornerRadiusPosition = TOP;
secondaryTrackSkin.width = 8.0;
Expand Down

0 comments on commit 8ad68da

Please sign in to comment.