Improved piano styling

This commit is contained in:
2023-02-09 11:38:01 -05:00
parent 16ce15621e
commit b15c260dfc
4 changed files with 62 additions and 18 deletions

View File

@@ -96,17 +96,25 @@ func (Default) Pattern (
if state.Disabled {
return disabledButtonPattern
} else {
if state.Pressed || state.On && c == C("basic", "checkbox") {
if state.Focused {
return pressedSelectedButtonPattern
if c == C("fun", "sharpKey") {
if state.Pressed {
return pressedDarkButtonPattern
} else {
return pressedButtonPattern
}
return darkButtonPattern
}
} else {
if state.Focused {
return selectedButtonPattern
if state.Pressed || state.On && c == C("basic", "checkbox") {
if state.Focused {
return pressedSelectedButtonPattern
} else {
return pressedButtonPattern
}
} else {
return buttonPattern
if state.Focused {
return selectedButtonPattern
} else {
return buttonPattern
}
}
}
}
@@ -156,19 +164,24 @@ func (Default) Inset (pattern Pattern, c Case) Inset {
if c == C("basic", "listEntry") {
return Inset { 4, 6, 4, 6 }
} else {
return Inset { 1, 1, 1, 1 }
return Inset { 2, 2, 2, 2 }
}
case PatternSunken:
if c == C("basic", "list") {
return Inset { 2, 1, 2, 1 }
} else if c == C("basic", "progressBar") {
return Inset { 2, 1, 1, 2 }
} else {
return Inset { 1, 1, 1, 1 }
return Inset { 2, 2, 2, 2 }
}
case PatternPinboard:
return Inset { 2, 2, 2, 2 }
case PatternInput, PatternButton, PatternHandle, PatternPinboard:
return Inset { 1, 1, 1, 1}
case PatternInput, PatternButton, PatternHandle:
return Inset { 2, 2, 2, 2}
default: return Inset { }
}
}

View File

@@ -93,7 +93,6 @@ var selectedButtonPattern = artist.NewMultiBordered (
},
artist.Stroke { Weight: 1, Pattern: accentPattern },
artist.Stroke { Pattern: artist.NewUniform(hex(0x8D9894FF)) })
var pressedButtonPattern = artist.NewMultiBordered (
artist.Stroke { Weight: 1, Pattern: strokePattern },
artist.Stroke {
@@ -118,6 +117,27 @@ var disabledButtonPattern = artist.NewMultiBordered (
artist.Stroke { Weight: 1, Pattern: weakForegroundPattern },
artist.Stroke { Pattern: backgroundPattern })
var darkButtonPattern = artist.NewMultiBordered (
artist.Stroke { Weight: 1, Pattern: strokePattern },
artist.Stroke {
Weight: 1,
Pattern: artist.Beveled {
artist.NewUniform(hex(0xaebdb9FF)),
artist.NewUniform(hex(0x3b4947FF)),
},
},
artist.Stroke { Pattern: artist.NewUniform(hex(0x6b7a75FF)) })
var pressedDarkButtonPattern = artist.NewMultiBordered (
artist.Stroke { Weight: 1, Pattern: strokePattern },
artist.Stroke {
Weight: 1,
Pattern: artist.Beveled {
artist.NewUniform(hex(0x3b4947FF)),
artist.NewUniform(hex(0x6b7a75FF)),
},
},
artist.Stroke { Pattern: artist.NewUniform(hex(0x6b7a75FF)) })
var inputPattern = artist.NewMultiBordered (
artist.Stroke { Weight: 1, Pattern: strokePattern },
artist.Stroke {