Refactor checkbox

This commit is contained in:
Gustas
2022-06-20 17:07:45 +03:00
committed by teinarss
parent 804bff1b0e
commit bf5bd63635
13 changed files with 138 additions and 65 deletions

View File

@@ -394,13 +394,29 @@ reload-icon:
disabled-10: 955, 34, 16, 16
disabled-11: 972, 34, 16, 16
checkbox-bits:
checkmark-tick:
Inherits: ^Chrome
Regions:
checked: 972, 17, 16, 16
checked-pressed: 989, 17, 16, 16
checked-disabled: 989, 17, 16, 16
crossed: 972, 0, 16, 16
crossed-disabled: 989, 0, 16, 16
unchecked: 0, 0, 0, 0
unchecked-pressed: 989, 17, 16, 16
checkmark-highlighted-tick:
Inherits: checkmark-tick
checkmark-cross:
Inherits: ^Chrome
Regions:
checked: 972, 0, 16, 16
checked-pressed: 989, 0, 16, 16
checked-disabled: 989, 0, 16, 16
unchecked: 0, 0, 0, 0
unchecked-pressed: 989, 0, 16, 16
checkmark-highlighted-cross:
Inherits: checkmark-cross
flags:
Inherits: ^Chrome

View File

@@ -166,7 +166,7 @@ Container@LOBBY_PLAYER_BIN:
Y: 4
Width: 20
Height: 20
ImageCollection: checkbox-bits
ImageCollection: checkmark-tick
ImageName: checked
Visible: false
Checkbox@STATUS_CHECKBOX:
@@ -294,7 +294,7 @@ Container@LOBBY_PLAYER_BIN:
Y: 4
Width: 20
Height: 20
ImageCollection: checkbox-bits
ImageCollection: checkmark-tick
ImageName: checked
Visible: false
Container@TEMPLATE_EMPTY:
@@ -376,7 +376,7 @@ Container@LOBBY_PLAYER_BIN:
Y: 4
Width: 20
Height: 20
ImageCollection: checkbox-bits
ImageCollection: checkmark-tick
ImageName: checked
Visible: false
Checkbox@STATUS_CHECKBOX:
@@ -457,7 +457,7 @@ Container@LOBBY_PLAYER_BIN:
Y: 4
Width: 20
Height: 20
ImageCollection: checkbox-bits
ImageCollection: checkmark-tick
ImageName: checked
Visible: false
Container@TEMPLATE_NEW_SPECTATOR:

View File

@@ -3,5 +3,4 @@
Metrics:
ButtonDepth: 0
ButtonFont: Bold
CheckboxPressedState: true
TextfieldColorHighlight: 800000

View File

@@ -168,7 +168,7 @@ Container@LOBBY_PLAYER_BIN:
Y: 4
Width: 20
Height: 20
ImageCollection: checkbox-bits
ImageCollection: checkmark-tick
ImageName: checked
Visible: false
Container@TEMPLATE_NONEDITABLE_PLAYER:
@@ -288,7 +288,7 @@ Container@LOBBY_PLAYER_BIN:
Y: 4
Width: 20
Height: 20
ImageCollection: checkbox-bits
ImageCollection: checkmark-tick
ImageName: checked
Visible: false
Container@TEMPLATE_EMPTY:
@@ -373,7 +373,7 @@ Container@LOBBY_PLAYER_BIN:
Y: 4
Width: 20
Height: 20
ImageCollection: checkbox-bits
ImageCollection: checkmark-tick
ImageName: checked
Visible: false
Container@TEMPLATE_NONEDITABLE_SPECTATOR:
@@ -448,7 +448,7 @@ Container@LOBBY_PLAYER_BIN:
Y: 4
Width: 20
Height: 20
ImageCollection: checkbox-bits
ImageCollection: checkmark-tick
ImageName: checked
Visible: false
Container@TEMPLATE_NEW_SPECTATOR:

View File

@@ -8,7 +8,6 @@ Metrics:
ButtonTextContrastColorLight: 7F7F7F
ButtonTextContrastRadius: 1
ButtonTextShadow: false
CheckboxPressedState: false
GameStartedColor: FFA500
HotkeyColor: FFFFFF
HotkeyColorDisabled: 808080

View File

@@ -373,18 +373,35 @@ slider-thumb-disabled:
checkbox:
Inherits: button-pressed
checkbox-bits:
checkmark-tick:
Inherits: ^Glyphs
Regions:
checked: 187, 0, 16, 16
checked-disabled: 204, 0, 16, 16
crossed: 221, 0, 16, 16
crossed-disabled: 238, 0, 16, 16
checked-pressed: 204, 0, 16, 16
unchecked: 0, 0, 0, 0
unchecked-pressed: 204, 0, 16, 16
checkmark-highlighted-tick:
Inherits: checkmark-tick
checkmark-cross:
Inherits: ^Glyphs
Regions:
checked: 221, 0, 16, 16
checked-pressed: 238, 0, 16, 16
unchecked: 0, 0, 0, 0
unchecked-pressed: 238, 0, 16, 16
checkmark-highlighted-cross:
Inherits: checkmark-cross
checkbox-hover:
Inherits: ^Dialog
PanelRegion: 641, 129, 2, 2, 122, 122, 2, 2
checkbox-pressed:
Inherits: checkbox-hover
# Same as a button-disabled-pressed
checkbox-disabled:
Inherits: ^Dialog
@@ -396,6 +413,9 @@ checkbox-highlighted:
checkbox-highlighted-hover:
Inherits: checkbox-highlighted
checkbox-highlighted-pressed:
Inherits: checkbox-highlighted
checkbox-highlighted-disabled:
Inherits: checkbox-disabled

View File

@@ -168,7 +168,7 @@ Container@LOBBY_PLAYER_BIN:
Y: 4
Width: 20
Height: 20
ImageCollection: checkbox-bits
ImageCollection: checkmark-tick
ImageName: checked
Visible: false
Container@TEMPLATE_NONEDITABLE_PLAYER:
@@ -288,7 +288,7 @@ Container@LOBBY_PLAYER_BIN:
Y: 4
Width: 20
Height: 20
ImageCollection: checkbox-bits
ImageCollection: checkmark-tick
ImageName: checked
Visible: false
Container@TEMPLATE_EMPTY:
@@ -373,7 +373,7 @@ Container@LOBBY_PLAYER_BIN:
Y: 4
Width: 20
Height: 20
ImageCollection: checkbox-bits
ImageCollection: checkmark-tick
ImageName: checked
Visible: false
Container@TEMPLATE_NONEDITABLE_SPECTATOR:
@@ -448,7 +448,7 @@ Container@LOBBY_PLAYER_BIN:
Y: 4
Width: 20
Height: 20
ImageCollection: checkbox-bits
ImageCollection: checkmark-tick
ImageName: checked
Visible: false
Container@TEMPLATE_NEW_SPECTATOR:

View File

@@ -3,7 +3,6 @@
Metrics:
ButtonDepth: 0
ButtonFont: Bold
CheckboxPressedState: true
ChatLineSound: ChatLine
ClickDisabledSound: ClickDisabledSound
ClickSound: ClickSound

View File

@@ -502,18 +502,35 @@ slider-thumb-disabled:
checkbox:
Inherits: button-pressed
checkbox-bits:
checkmark-tick:
Inherits: ^Glyphs
Regions:
checked: 187, 0, 16, 16
checked-disabled: 204, 0, 16, 16
crossed: 221, 0, 16, 16
crossed-disabled: 238, 0, 16, 16
checked-pressed: 204, 0, 16, 16
unchecked: 0, 0, 0, 0
unchecked-pressed: 204, 0, 16, 16
checkmark-highlighted-tick:
Inherits: checkmark-tick
checkmark-cross:
Inherits: ^Glyphs
Regions:
checked: 221, 0, 16, 16
checked-pressed: 238, 0, 16, 16
unchecked: 0, 0, 0, 0
unchecked-pressed: 238, 0, 16, 16
checkmark-highlighted-cross:
Inherits: checkmark-cross
checkbox-hover:
Inherits: ^Dialog
PanelRegion: 641, 129, 2, 2, 122, 122, 2, 2
checkbox-pressed:
Inherits: checkbox-hover
checkbox-disabled:
Inherits: ^Dialog
PanelRegion: 641, 257, 2, 2, 122, 122, 2, 2
@@ -525,6 +542,9 @@ checkbox-highlighted:
checkbox-highlighted-hover:
Inherits: checkbox-highlighted
checkbox-highlighted-pressed:
Inherits: checkbox-highlighted
checkbox-highlighted-disabled:
Inherits: checkbox-disabled

View File

@@ -635,18 +635,35 @@ slider-thumb-disabled:
checkbox:
Inherits: button-pressed
checkbox-bits:
checkmark-tick:
Inherits: ^Glyphs
Regions:
checked: 187, 0, 16, 16
checked-disabled: 204, 0, 16, 16
crossed: 221, 0, 16, 16
crossed-disabled: 238, 0, 16, 16
checked-pressed: 204, 0, 16, 16
unchecked: 0, 0, 0, 0
unchecked-pressed: 204, 0, 16, 16
checkmark-highlighted-tick:
Inherits: checkmark-tick
checkmark-cross:
Inherits: ^Glyphs
Regions:
checked: 221, 0, 16, 16
checked-pressed: 238, 0, 16, 16
unchecked: 0, 0, 0, 0
unchecked-pressed: 238, 0, 16, 16
checkmark-highlighted-cross:
Inherits: checkmark-cross
checkbox-hover:
Inherits: ^Dialog
PanelRegion: 641, 129, 2, 2, 122, 122, 2, 2
checkbox-pressed:
Inherits: checkbox-hover
checkbox-disabled:
Inherits: ^Dialog
PanelRegion: 641, 257, 2, 2, 122, 122, 2, 2
@@ -658,6 +675,9 @@ checkbox-highlighted:
checkbox-highlighted-hover:
Inherits: checkbox-highlighted
checkbox-highlighted-pressed:
Inherits: checkbox-highlighted
checkbox-highlighted-disabled:
Inherits: checkbox-disabled