Format cleanup

This commit is contained in:
Oliver 'kfsone' Smith 2021-02-24 13:23:26 -08:00
parent 113982db71
commit 69cba1203d
5 changed files with 5 additions and 7 deletions

View file

@ -9,8 +9,8 @@ type buttonColoring struct {
// buttonColors lists the styling for each supported state. // buttonColors lists the styling for each supported state.
var buttonColors = map[ControlState]buttonColoring{ var buttonColors = map[ControlState]buttonColoring{
Normal: {ButtonDefaultBorderColor, ButtonDefaultInsideColor, ButtonDefaultTextColor}, Normal: {ButtonDefaultBorderColor, ButtonDefaultInsideColor, ButtonDefaultTextColor},
Clicked: {ButtonDefaultBorderColor, ButtonDefaultInsideColor, ButtonDefaultTextColor}, Clicked: {ButtonDefaultBorderColor, ButtonDefaultInsideColor, ButtonDefaultTextColor},
Focused: {ButtonHoverBorderColor, ButtonHoverInsideColor, ButtonHoverTextColor}, Focused: {ButtonHoverBorderColor, ButtonHoverInsideColor, ButtonHoverTextColor},
Pressed: {ButtonPressedBorderColor, ButtonPressedInsideColor, ButtonPressedTextColor}, Pressed: {ButtonPressedBorderColor, ButtonPressedInsideColor, ButtonPressedTextColor},
} }

View file

@ -9,7 +9,7 @@ type checkboxColoring struct {
// checkboxColors lists the styling for each supported state. // checkboxColors lists the styling for each supported state.
var checkboxColors = map[ControlState]checkboxColoring{ var checkboxColors = map[ControlState]checkboxColoring{
Normal: {CheckboxDefaultBorderColor, CheckboxDefaultInsideColor}, Normal: {CheckboxDefaultBorderColor, CheckboxDefaultInsideColor},
Clicked: {CheckboxDefaultBorderColor, CheckboxDefaultInsideColor}, Clicked: {CheckboxDefaultBorderColor, CheckboxDefaultInsideColor},
Pressed: {CheckboxClickBorderColor, CheckboxClickInsideColor}, Pressed: {CheckboxClickBorderColor, CheckboxClickInsideColor},
Focused: {CheckboxHoverBorderColor, CheckboxHoverInsideColor}, Focused: {CheckboxHoverBorderColor, CheckboxHoverInsideColor},

View file

@ -14,8 +14,8 @@ type comboboxColoring struct {
} }
// comboboxColors lists the styling for each supported state. // comboboxColors lists the styling for each supported state.
var comboboxColors = map[ControlState]comboboxColoring { var comboboxColors = map[ControlState]comboboxColoring{
Normal: {ComboboxDefaultBorderColor, ComboboxDefaultInsideColor, ComboboxDefaultListTextColor, ComboboxDefaultTextColor}, Normal: {ComboboxDefaultBorderColor, ComboboxDefaultInsideColor, ComboboxDefaultListTextColor, ComboboxDefaultTextColor},
Clicked: {ComboboxDefaultBorderColor, ComboboxDefaultInsideColor, ComboboxDefaultListTextColor, ComboboxDefaultTextColor}, Clicked: {ComboboxDefaultBorderColor, ComboboxDefaultInsideColor, ComboboxDefaultListTextColor, ComboboxDefaultTextColor},
Focused: {ComboboxHoverBorderColor, ComboboxHoverInsideColor, ComboboxHoverListTextColor, ComboboxHoverTextColor}, Focused: {ComboboxHoverBorderColor, ComboboxHoverInsideColor, ComboboxHoverListTextColor, ComboboxHoverTextColor},
Pressed: {ComboboxPressedBorderColor, ComboboxPressedInsideColor, ComboboxPressedListTextColor, ComboboxPressedTextColor}, Pressed: {ComboboxPressedBorderColor, ComboboxPressedInsideColor, ComboboxPressedListTextColor, ComboboxPressedTextColor},

View file

@ -9,7 +9,6 @@ func Label(bounds rl.Rectangle, text string) {
// LabelEx - Label element extended, configurable colors // LabelEx - Label element extended, configurable colors
func LabelEx(bounds rl.Rectangle, text string, textColor, border, inner rl.Color) { func LabelEx(bounds rl.Rectangle, text string, textColor, border, inner rl.Color) {
// Update control
textHeight := GetStyle32(GlobalTextFontsize) textHeight := GetStyle32(GlobalTextFontsize)
textWidth := rl.MeasureText(text, textHeight) textWidth := rl.MeasureText(text, textHeight)

View file

@ -416,4 +416,3 @@ func GetStyle32(property Property) int32 {
func GetStyleColor(property Property) rl.Color { func GetStyleColor(property Property) rl.Color {
return rl.GetColor(int32(style[property])) return rl.GetColor(int32(style[property]))
} }