Using fontSizeReduced for Tray, PowerMenu and MediaCard player selector
This commit is contained in:
parent
f657eaff32
commit
622c34a551
3 changed files with 9 additions and 4 deletions
|
|
@ -116,7 +116,7 @@ PopupWindow {
|
||||||
return 8 * scaling
|
return 8 * scaling
|
||||||
} else {
|
} else {
|
||||||
// Calculate based on text content
|
// Calculate based on text content
|
||||||
const textHeight = text.contentHeight || (Style.fontSizeSmall * scaling * 1.2)
|
const textHeight = text.contentHeight || (Style.fontSizeReduced * scaling * 1.2)
|
||||||
return Math.max(32 * scaling, textHeight + 8)
|
return Math.max(32 * scaling, textHeight + 8)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -149,7 +149,7 @@ PopupWindow {
|
||||||
?? true) ? (mouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface) : Color.applyOpacity(
|
?? true) ? (mouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface) : Color.applyOpacity(
|
||||||
Color.mOnSurface, 64)
|
Color.mOnSurface, 64)
|
||||||
text: modelData?.text ?? ""
|
text: modelData?.text ?? ""
|
||||||
font.pointSize: Style.fontSizeSmall * scaling
|
font.pointSize: Style.fontSizeReduced * scaling
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
}
|
}
|
||||||
|
|
@ -164,7 +164,7 @@ PopupWindow {
|
||||||
|
|
||||||
NIcon {
|
NIcon {
|
||||||
text: modelData?.hasChildren ? "menu" : ""
|
text: modelData?.hasChildren ? "menu" : ""
|
||||||
font.pointSize: Style.fontSizeSmall * scaling
|
font.pointSize: Style.fontSizeReduced * scaling
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
visible: modelData?.hasChildren ?? false
|
visible: modelData?.hasChildren ?? false
|
||||||
color: Color.mOnSurface
|
color: Color.mOnSurface
|
||||||
|
|
|
||||||
|
|
@ -129,7 +129,7 @@ NBox {
|
||||||
width: playerSelector.width
|
width: playerSelector.width
|
||||||
contentItem: NText {
|
contentItem: NText {
|
||||||
text: modelData.identity
|
text: modelData.identity
|
||||||
font.pointSize: Style.fontSizeSmall * scaling
|
font.pointSize: Style.fontSizeReduced * scaling
|
||||||
color: highlighted ? Color.mSurface : Color.mOnSurface
|
color: highlighted ? Color.mSurface : Color.mOnSurface
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
|
|
|
||||||
|
|
@ -83,6 +83,7 @@ NPanel {
|
||||||
Text {
|
Text {
|
||||||
text: "Lock Screen"
|
text: "Lock Screen"
|
||||||
color: lockButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
|
color: lockButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
|
||||||
|
font.pointSize: Style.fontSizeReduced * scaling
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
anchors.verticalCenterOffset: 1 * scaling
|
anchors.verticalCenterOffset: 1 * scaling
|
||||||
|
|
@ -137,6 +138,7 @@ NPanel {
|
||||||
Text {
|
Text {
|
||||||
text: "Suspend"
|
text: "Suspend"
|
||||||
color: suspendButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
|
color: suspendButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
|
||||||
|
font.pointSize: Style.fontSizeReduced * scaling
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
anchors.verticalCenterOffset: 1 * scaling
|
anchors.verticalCenterOffset: 1 * scaling
|
||||||
|
|
@ -189,6 +191,7 @@ NPanel {
|
||||||
Text {
|
Text {
|
||||||
text: "Reboot"
|
text: "Reboot"
|
||||||
color: rebootButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
|
color: rebootButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
|
||||||
|
font.pointSize: Style.fontSizeReduced * scaling
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
anchors.verticalCenterOffset: 1 * scaling
|
anchors.verticalCenterOffset: 1 * scaling
|
||||||
|
|
@ -241,6 +244,7 @@ NPanel {
|
||||||
Text {
|
Text {
|
||||||
text: "Logout"
|
text: "Logout"
|
||||||
color: logoutButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
|
color: logoutButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
|
||||||
|
font.pointSize: Style.fontSizeReduced * scaling
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
anchors.verticalCenterOffset: 1 * scaling
|
anchors.verticalCenterOffset: 1 * scaling
|
||||||
|
|
@ -293,6 +297,7 @@ NPanel {
|
||||||
Text {
|
Text {
|
||||||
text: "Shutdown"
|
text: "Shutdown"
|
||||||
color: shutdownButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
|
color: shutdownButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
|
||||||
|
font.pointSize: Style.fontSizeReduced * scaling
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
anchors.verticalCenterOffset: 1 * scaling
|
anchors.verticalCenterOffset: 1 * scaling
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue