Skip to content

Commit

Permalink
Steel: more consistent setting of border/fill None value
Browse files Browse the repository at this point in the history
  • Loading branch information
joshtynjala committed Feb 21, 2024
1 parent 77fe890 commit c2f593d
Show file tree
Hide file tree
Showing 26 changed files with 62 additions and 34 deletions.
1 change: 1 addition & 0 deletions src/feathers/themes/steel/components/SteelAlertStyles.hx
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class SteelAlertStyles {

if (alert.backgroundSkin == null) {
var backgroundSkin = new RectangleSkin();
backgroundSkin.border = None;
backgroundSkin.fill = theme.getContainerFill();
backgroundSkin.maxWidth = 276.0;
alert.backgroundSkin = backgroundSkin;
Expand Down
6 changes: 3 additions & 3 deletions src/feathers/themes/steel/components/SteelButtonStyles.hx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class SteelButtonStyles {

if (button.focusRectSkin == null) {
var focusRectSkin = new RectangleSkin();
focusRectSkin.fill = null;
focusRectSkin.fill = None;
focusRectSkin.border = theme.getFocusBorder();
focusRectSkin.cornerRadius = 3.0;
button.focusRectSkin = focusRectSkin;
Expand Down Expand Up @@ -81,7 +81,7 @@ class SteelButtonStyles {

if (button.focusRectSkin == null) {
var focusRectSkin = new RectangleSkin();
focusRectSkin.fill = null;
focusRectSkin.fill = None;
focusRectSkin.border = theme.getFocusBorder();
focusRectSkin.cornerRadius = 3.0;
button.focusRectSkin = focusRectSkin;
Expand Down Expand Up @@ -116,7 +116,7 @@ class SteelButtonStyles {

if (button.focusRectSkin == null) {
var focusRectSkin = new RectangleSkin();
focusRectSkin.fill = null;
focusRectSkin.fill = None;
focusRectSkin.border = theme.getFocusBorder();
focusRectSkin.cornerRadius = 3.0;
button.focusRectSkin = focusRectSkin;
Expand Down
4 changes: 2 additions & 2 deletions src/feathers/themes/steel/components/SteelCheckStyles.hx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class SteelCheckStyles {
if (check.backgroundSkin == null) {
var backgroundSkin = new RectangleSkin();
backgroundSkin.fill = SolidColor(0x000000, 0.0);
backgroundSkin.border = null;
backgroundSkin.border = None;
check.backgroundSkin = backgroundSkin;
}

Expand Down Expand Up @@ -111,7 +111,7 @@ class SteelCheckStyles {

if (check.focusRectSkin == null) {
var focusRectSkin = new RectangleSkin();
focusRectSkin.fill = null;
focusRectSkin.fill = None;
focusRectSkin.border = theme.getFocusBorder();
focusRectSkin.cornerRadius = 3.0;
check.focusRectSkin = focusRectSkin;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,14 @@ class SteelDatePickerStyles {
styleProvider.setStyleFunction(DatePicker, null, function(datePicker:DatePicker):Void {
if (datePicker.backgroundSkin == null) {
var backgroundSkin = new RectangleSkin();
backgroundSkin.border = None;
backgroundSkin.fill = theme.getContainerFill();
datePicker.backgroundSkin = backgroundSkin;
}

if (datePicker.focusRectSkin == null) {
var focusRectSkin = new RectangleSkin();
focusRectSkin.fill = null;
focusRectSkin.fill = None;
focusRectSkin.border = theme.getFocusBorder();
datePicker.focusRectSkin = focusRectSkin;
}
Expand Down Expand Up @@ -237,6 +238,7 @@ class SteelDatePickerStyles {
backgroundSkin.fill = SolidColor(0xff00ff, 0.0);
backgroundSkin.selectedFill = theme.getActiveThemeFill();
backgroundSkin.setFillForState(ToggleButtonState.DOWN(false), theme.getReversedActiveThemeFill());
backgroundSkin.border = None;
backgroundSkin.selectedBorder = theme.getSelectedBorder();
backgroundSkin.setBorderForState(ToggleButtonState.DOWN(false), theme.getActiveFillBorder());
if (isDesktop) {
Expand Down Expand Up @@ -280,6 +282,7 @@ class SteelDatePickerStyles {
backgroundSkin.fill = SolidColor(0xff00ff, 0.0);
backgroundSkin.selectedFill = theme.getActiveThemeFill();
backgroundSkin.setFillForState(ToggleButtonState.DOWN(false), theme.getReversedActiveThemeFill());
backgroundSkin.border = None;
backgroundSkin.selectedBorder = theme.getSelectedBorder();
backgroundSkin.setBorderForState(ToggleButtonState.DOWN(false), theme.getActiveFillBorder());
if (isDesktop) {
Expand Down
2 changes: 1 addition & 1 deletion src/feathers/themes/steel/components/SteelDrawerStyles.hx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class SteelDrawerStyles {
if (drawer.overlaySkin == null) {
var overlaySkin = new RectangleSkin();
overlaySkin.fill = theme.getOverlayFill();
overlaySkin.border = null;
overlaySkin.border = None;
overlaySkin.width = 1.0;
overlaySkin.height = 1.0;
drawer.overlaySkin = overlaySkin;
Expand Down
14 changes: 9 additions & 5 deletions src/feathers/themes/steel/components/SteelGridViewStyles.hx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class SteelGridViewStyles {
if (gridView.columnResizeSkin == null) {
var columnResizeSkin = new RectangleSkin();
columnResizeSkin.fill = theme.getThemeFill();
columnResizeSkin.border = null;
columnResizeSkin.border = None;
columnResizeSkin.width = 2.0;
columnResizeSkin.height = 2.0;
gridView.columnResizeSkin = columnResizeSkin;
Expand All @@ -70,12 +70,13 @@ class SteelGridViewStyles {
if (gridView.headerCornerSkin == null) {
var headerCornerSkin = new RectangleSkin();
headerCornerSkin.fill = theme.getSubHeadingFill();
headerCornerSkin.border = None;
gridView.headerCornerSkin = headerCornerSkin;
}

if (gridView.focusRectSkin == null) {
var focusRectSkin = new RectangleSkin();
focusRectSkin.fill = null;
focusRectSkin.fill = None;
focusRectSkin.border = theme.getFocusBorder();
gridView.focusRectSkin = focusRectSkin;
}
Expand Down Expand Up @@ -103,6 +104,7 @@ class SteelGridViewStyles {
if (gridView.backgroundSkin == null) {
var backgroundSkin = new RectangleSkin();
backgroundSkin.fill = theme.getContainerFill();
backgroundSkin.border = None;
backgroundSkin.width = 10.0;
backgroundSkin.height = 10.0;
gridView.backgroundSkin = backgroundSkin;
Expand All @@ -111,7 +113,7 @@ class SteelGridViewStyles {
if (gridView.columnResizeSkin == null) {
var columnResizeSkin = new RectangleSkin();
columnResizeSkin.fill = theme.getThemeFill();
columnResizeSkin.border = null;
columnResizeSkin.border = None;
columnResizeSkin.width = 2.0;
columnResizeSkin.height = 2.0;
gridView.columnResizeSkin = columnResizeSkin;
Expand All @@ -120,12 +122,13 @@ class SteelGridViewStyles {
if (gridView.headerCornerSkin == null) {
var headerCornerSkin = new RectangleSkin();
headerCornerSkin.fill = theme.getSubHeadingFill();
headerCornerSkin.border = None;
gridView.headerCornerSkin = headerCornerSkin;
}

if (gridView.focusRectSkin == null) {
var skin = new RectangleSkin();
skin.fill = null;
skin.fill = None;
skin.border = theme.getFocusBorder();
gridView.focusRectSkin = skin;
}
Expand Down Expand Up @@ -185,6 +188,7 @@ class SteelGridViewStyles {
if (itemRenderer.backgroundSkin == null) {
var skin = new RectangleSkin();
skin.fill = theme.getSubHeadingFill();
skin.border = None;
if (isDesktop) {
skin.width = 22.0;
skin.height = 22.0;
Expand Down Expand Up @@ -228,8 +232,8 @@ class SteelGridViewStyles {

if (headerDivider.backgroundSkin == null) {
var skin = new VerticalLineSkin();
skin.border = theme.getSubHeadingDividerBorder();
skin.fill = SolidColor(0xff00ff, 0.0);
skin.border = theme.getSubHeadingDividerBorder();
skin.setBorderForState(HOVER, theme.getThemeBorder());
if (isDesktop) {
skin.width = 6.0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class SteelGroupListViewStyles {

if (listView.focusRectSkin == null) {
var focusRectSkin = new RectangleSkin();
focusRectSkin.fill = null;
focusRectSkin.fill = None;
focusRectSkin.border = theme.getFocusBorder();
listView.focusRectSkin = focusRectSkin;
}
Expand All @@ -81,14 +81,15 @@ class SteelGroupListViewStyles {
if (listView.backgroundSkin == null) {
var backgroundSkin = new RectangleSkin();
backgroundSkin.fill = theme.getContainerFill();
backgroundSkin.border = None;
backgroundSkin.width = 10.0;
backgroundSkin.height = 10.0;
listView.backgroundSkin = backgroundSkin;
}

if (listView.focusRectSkin == null) {
var skin = new RectangleSkin();
skin.fill = null;
skin.fill = None;
skin.border = theme.getFocusBorder();
listView.focusRectSkin = skin;
}
Expand Down Expand Up @@ -117,6 +118,7 @@ class SteelGroupListViewStyles {
if (itemRenderer.backgroundSkin == null) {
var skin = new RectangleSkin();
skin.fill = theme.getSubHeadingFill();
skin.border = None;
skin.width = 22.0;
skin.height = 22.0;
skin.minWidth = 22.0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class SteelHDividedBoxStyles {
if (dividedBox.resizeDraggingSkin == null) {
var resizeDraggingSkin = new RectangleSkin();
resizeDraggingSkin.fill = theme.getThemeFill();
resizeDraggingSkin.border = null;
resizeDraggingSkin.border = None;
resizeDraggingSkin.width = 2.0;
resizeDraggingSkin.height = 2.0;
dividedBox.resizeDraggingSkin = resizeDraggingSkin;
Expand Down
2 changes: 2 additions & 0 deletions src/feathers/themes/steel/components/SteelHScrollBarStyles.hx
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class SteelHScrollBarStyles {
var thumbSkin = new RectangleSkin();
thumbSkin.fill = theme.getScrollBarThumbFill();
thumbSkin.disabledFill = theme.getScrollBarThumbDisabledFill();
thumbSkin.border = None;
var size = isDesktop ? 6.0 : 4.0;
thumbSkin.width = size;
thumbSkin.height = size;
Expand All @@ -60,6 +61,7 @@ class SteelHScrollBarStyles {
var trackSkin = new RectangleSkin();
trackSkin.fill = theme.getControlFill();
trackSkin.disabledFill = theme.getControlDisabledFill();
trackSkin.border = None;
trackSkin.width = 12.0;
trackSkin.height = 12.0;
trackSkin.minWidth = 12.0;
Expand Down
2 changes: 1 addition & 1 deletion src/feathers/themes/steel/components/SteelHSliderStyles.hx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class SteelHSliderStyles {
thumb.backgroundSkin = backgroundSkin;

var focusRectSkin = new CircleSkin();
focusRectSkin.fill = null;
focusRectSkin.fill = None;
focusRectSkin.border = theme.getFocusBorder();
thumb.focusRectSkin = focusRectSkin;

Expand Down
1 change: 1 addition & 0 deletions src/feathers/themes/steel/components/SteelHeaderStyles.hx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class SteelHeaderStyles {
if (header.backgroundSkin == null) {
var backgroundSkin = new RectangleSkin();
backgroundSkin.fill = theme.getHeaderFill();
backgroundSkin.border = None;
if (isDesktop) {
backgroundSkin.width = 32.0;
backgroundSkin.height = 32.0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class SteelLayoutGroupStyles {
if (group.backgroundSkin == null) {
var backgroundSkin = new RectangleSkin();
backgroundSkin.fill = theme.getHeaderFill();
backgroundSkin.border = None;
if (isDesktop) {
backgroundSkin.width = 32.0;
backgroundSkin.height = 32.0;
Expand Down
5 changes: 3 additions & 2 deletions src/feathers/themes/steel/components/SteelListViewStyles.hx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class SteelListViewStyles {

if (listView.focusRectSkin == null) {
var focusRectSkin = new RectangleSkin();
focusRectSkin.fill = null;
focusRectSkin.fill = None;
focusRectSkin.border = theme.getFocusBorder();
listView.focusRectSkin = focusRectSkin;
}
Expand All @@ -80,14 +80,15 @@ class SteelListViewStyles {
if (listView.backgroundSkin == null) {
var backgroundSkin = new RectangleSkin();
backgroundSkin.fill = theme.getContainerFill();
backgroundSkin.border = None;
backgroundSkin.width = 10.0;
backgroundSkin.height = 10.0;
listView.backgroundSkin = backgroundSkin;
}

if (listView.focusRectSkin == null) {
var focusRectSkin = new RectangleSkin();
focusRectSkin.fill = null;
focusRectSkin.fill = None;
focusRectSkin.border = theme.getFocusBorder();
listView.focusRectSkin = focusRectSkin;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class SteelPageIndicatorStyles {
styleProvider.setStyleFunction(PageIndicator, null, function(pages:PageIndicator):Void {
if (pages.focusRectSkin == null) {
var focusRectSkin = new RectangleSkin();
focusRectSkin.fill = null;
focusRectSkin.fill = None;
focusRectSkin.border = theme.getFocusBorder();
focusRectSkin.cornerRadius = 3.0;
pages.focusRectSkin = focusRectSkin;
Expand Down
2 changes: 2 additions & 0 deletions src/feathers/themes/steel/components/SteelPanelStyles.hx
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,14 @@ class SteelPanelStyles {
if (panel.backgroundSkin == null) {
var backgroundSkin = new RectangleSkin();
backgroundSkin.fill = theme.getContainerFill();
backgroundSkin.border = None;
panel.backgroundSkin = backgroundSkin;
}

if (panel.scrollBarsCornerSkin == null) {
var scrollBarsCornerSkin = new RectangleSkin();
scrollBarsCornerSkin.fill = theme.getContainerFill();
scrollBarsCornerSkin.border = None;
panel.scrollBarsCornerSkin = scrollBarsCornerSkin;
}
});
Expand Down
4 changes: 2 additions & 2 deletions src/feathers/themes/steel/components/SteelRadioStyles.hx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class SteelRadioStyles {
if (radio.backgroundSkin == null) {
var backgroundSkin = new RectangleSkin();
backgroundSkin.fill = SolidColor(0x000000, 0.0);
backgroundSkin.border = null;
backgroundSkin.border = None;
radio.backgroundSkin = backgroundSkin;
}

Expand Down Expand Up @@ -100,7 +100,7 @@ class SteelRadioStyles {

if (radio.focusRectSkin == null) {
var focusRectSkin = new RectangleSkin();
focusRectSkin.fill = null;
focusRectSkin.fill = None;
focusRectSkin.border = theme.getFocusBorder();
focusRectSkin.cornerRadius = 3.0;
radio.focusRectSkin = focusRectSkin;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,20 @@ class SteelScrollContainerStyles {
if (container.backgroundSkin == null) {
var backgroundSkin = new RectangleSkin();
backgroundSkin.fill = theme.getContainerFill();
backgroundSkin.border = None;
container.backgroundSkin = backgroundSkin;
}

if (container.scrollBarsCornerSkin == null) {
var scrollBarsCornerSkin = new RectangleSkin();
scrollBarsCornerSkin.fill = theme.getContainerFill();
scrollBarsCornerSkin.border = None;
container.scrollBarsCornerSkin = scrollBarsCornerSkin;
}

if (container.focusRectSkin == null) {
var focusRectSkin = new RectangleSkin();
focusRectSkin.fill = null;
focusRectSkin.fill = None;
focusRectSkin.border = theme.getFocusBorder();
container.focusRectSkin = focusRectSkin;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class SteelSortOrderHeaderRendererStyles {
if (itemRenderer.backgroundSkin == null) {
var skin = new RectangleSkin();
skin.fill = theme.getSubHeadingFill();
skin.border = None;
if (isDesktop) {
skin.width = 22.0;
skin.height = 22.0;
Expand Down
3 changes: 2 additions & 1 deletion src/feathers/themes/steel/components/SteelTabBarStyles.hx
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,12 @@ class SteelTabBarStyles {
var skin = new RectangleSkin();
skin.fill = theme.getControlFill();
skin.disabledFill = theme.getControlDisabledFill();
skin.border = None;
tabBar.backgroundSkin = skin;
}
if (tabBar.focusRectSkin == null) {
var focusRectSkin = new RectangleSkin();
focusRectSkin.fill = null;
focusRectSkin.fill = None;
focusRectSkin.border = theme.getFocusBorder();
tabBar.focusRectSkin = focusRectSkin;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class SteelToggleButtonStyles {

if (button.focusRectSkin == null) {
var focusRectSkin = new RectangleSkin();
focusRectSkin.fill = null;
focusRectSkin.fill = None;
focusRectSkin.border = theme.getFocusBorder();
focusRectSkin.cornerRadius = 3.0;
button.focusRectSkin = focusRectSkin;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class SteelToggleSwitchStyles {
}
if (toggle.focusRectSkin == null) {
var focusRectSkin = new RectangleSkin();
focusRectSkin.fill = null;
focusRectSkin.fill = None;
focusRectSkin.border = theme.getFocusBorder();
if (isDesktop) {
focusRectSkin.cornerRadius = 12.0;
Expand Down
Loading

0 comments on commit c2f593d

Please sign in to comment.