Icons: Brightness and battery
This commit is contained in:
parent
404a1d3e8b
commit
ea6b8e0c02
18 changed files with 36 additions and 66 deletions
|
|
@ -502,7 +502,7 @@ Popup {
|
|||
|
||||
NButton {
|
||||
text: "Apply"
|
||||
icon: "check"
|
||||
icon: FontService.icons["check"]
|
||||
customHeight: 36 * scaling
|
||||
customWidth: 100 * scaling
|
||||
onClicked: {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ Item {
|
|||
property color iconTextColor: Color.mSurface
|
||||
property color collapsedIconColor: Color.mOnSurface
|
||||
|
||||
property real iconRotation: 0
|
||||
property real sizeRatio: 0.8
|
||||
property bool autoHide: false
|
||||
property bool forceOpen: false
|
||||
|
|
@ -119,7 +118,6 @@ Item {
|
|||
|
||||
NIcon {
|
||||
text: root.icon
|
||||
rotation: root.iconRotation
|
||||
font.pointSize: Style.fontSizeM * scaling
|
||||
// When forced shown, use pill text color; otherwise accent color when hovered
|
||||
color: forceOpen ? textColor : (showPill ? iconTextColor : Color.mOnSurface)
|
||||
|
|
|
|||
|
|
@ -118,17 +118,7 @@ Item {
|
|||
// Icon
|
||||
NIcon {
|
||||
id: icon
|
||||
text: {
|
||||
switch (root.type) {
|
||||
case "warning":
|
||||
return "warning"
|
||||
case "notice":
|
||||
return "info"
|
||||
default:
|
||||
return "info"
|
||||
}
|
||||
}
|
||||
|
||||
text: (root.type == "warning") ? FontService.icons["warning"] : FontService.icons["info"]
|
||||
color: {
|
||||
switch (root.type) {
|
||||
case "warning":
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue