Polishing
- Volume: better spread/usage of the 3 icons - Rosepine colors: more contrast to compare to matugen - NPill: different look when pile is always opened
This commit is contained in:
parent
76ef2469e8
commit
56d87ecfcf
3 changed files with 8 additions and 10 deletions
|
|
@ -1,19 +1,19 @@
|
||||||
{
|
{
|
||||||
"dark": {
|
"dark": {
|
||||||
"mPrimary": "#ebbcba",
|
"mPrimary": "#ebbcba",
|
||||||
"mOnPrimary": "#1f1d2e",
|
"mOnPrimary": "#191724",
|
||||||
"mSecondary": "#9ccfd8",
|
"mSecondary": "#9ccfd8",
|
||||||
"mOnSecondary": "#1f1d2e",
|
"mOnSecondary": "#191724",
|
||||||
"mTertiary": "#f6c177",
|
"mTertiary": "#f6c177",
|
||||||
"mOnTertiary": "#1f1d2e",
|
"mOnTertiary": "#191724",
|
||||||
"mError": "#eb6f92",
|
"mError": "#eb6f92",
|
||||||
"mOnError": "#1f1d2e",
|
"mOnError": "#191724",
|
||||||
"mSurface": "#1f1d2e",
|
"mSurface": "#191724",
|
||||||
"mOnSurface": "#e0def4",
|
"mOnSurface": "#e0def4",
|
||||||
"mSurfaceVariant": "#26233a",
|
"mSurfaceVariant": "#26233a",
|
||||||
"mOnSurfaceVariant": "#908caa",
|
"mOnSurfaceVariant": "#908caa",
|
||||||
"mOutline": "#403d52",
|
"mOutline": "#403d52",
|
||||||
"mShadow": "#1f1d2e"
|
"mShadow": "#191724"
|
||||||
},
|
},
|
||||||
"light": {
|
"light": {
|
||||||
"mPrimary": "#d46e6b",
|
"mPrimary": "#d46e6b",
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ Item {
|
||||||
if (AudioService.muted) {
|
if (AudioService.muted) {
|
||||||
return "volume-mute"
|
return "volume-mute"
|
||||||
}
|
}
|
||||||
return AudioService.volume <= Number.EPSILON ? "volume-off" : (AudioService.volume < 0.5 ? "volume-down" : "volume-up")
|
return AudioService.volume <= 0.2? "volume-off" : (AudioService.volume < 0.6 ? "volume-down" : "volume-up")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Connection used to open the pill when volume changes
|
// Connection used to open the pill when volume changes
|
||||||
|
|
|
||||||
|
|
@ -102,10 +102,8 @@ Item {
|
||||||
height: iconSize
|
height: iconSize
|
||||||
radius: width * 0.5
|
radius: width * 0.5
|
||||||
// When forced shown, match pill background; otherwise use accent when hovered
|
// When forced shown, match pill background; otherwise use accent when hovered
|
||||||
color: forceOpen ? pillColor : (showPill ? iconCircleColor : Color.mSurfaceVariant)
|
color: forceOpen ? Color.mSurface : (showPill ? iconCircleColor : Color.mSurfaceVariant)
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
border.width: Math.max(1, Style.borderS * scaling)
|
|
||||||
border.color: forceOpen ? Qt.alpha(Color.mOutline, 0.5) : Color.transparent
|
|
||||||
|
|
||||||
x: rightOpen ? 0 : (parent.width - width)
|
x: rightOpen ? 0 : (parent.width - width)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue