mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-04-12 08:42:13 -04:00
process list: fix scaling with fonts fixes #1721
This commit is contained in:
@@ -83,9 +83,9 @@ FloatingWindow {
|
|||||||
|
|
||||||
objectName: "processListModal"
|
objectName: "processListModal"
|
||||||
title: I18n.tr("System Monitor", "sysmon window title")
|
title: I18n.tr("System Monitor", "sysmon window title")
|
||||||
minimumSize: Qt.size(750, 550)
|
minimumSize: Qt.size(Math.min(Math.round(Theme.fontSizeMedium * 48), Screen.width), Math.min(Math.round(Theme.fontSizeMedium * 34), Screen.height))
|
||||||
implicitWidth: 1000
|
implicitWidth: Math.round(Theme.fontSizeMedium * 71)
|
||||||
implicitHeight: 720
|
implicitHeight: Math.round(Theme.fontSizeMedium * 51)
|
||||||
color: Theme.surfaceContainer
|
color: Theme.surfaceContainer
|
||||||
visible: false
|
visible: false
|
||||||
|
|
||||||
@@ -236,7 +236,7 @@ FloatingWindow {
|
|||||||
|
|
||||||
Item {
|
Item {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.preferredHeight: 48
|
Layout.preferredHeight: Math.round(Theme.fontSizeMedium * 3.4)
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
@@ -293,10 +293,10 @@ FloatingWindow {
|
|||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.preferredHeight: 52
|
Layout.preferredHeight: Math.round(Theme.fontSizeMedium * 3.7)
|
||||||
Layout.leftMargin: Theme.spacingL
|
Layout.leftMargin: Theme.spacingL
|
||||||
Layout.rightMargin: Theme.spacingL
|
Layout.rightMargin: Theme.spacingL
|
||||||
spacing: Theme.spacingL
|
spacing: Theme.spacingM
|
||||||
|
|
||||||
Row {
|
Row {
|
||||||
spacing: 2
|
spacing: 2
|
||||||
@@ -322,14 +322,15 @@ FloatingWindow {
|
|||||||
]
|
]
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
width: 120
|
width: tabRowContent.implicitWidth + Theme.spacingM * 2
|
||||||
height: 44
|
height: Math.round(Theme.fontSizeMedium * 3.1)
|
||||||
radius: Theme.cornerRadius
|
radius: Theme.cornerRadius
|
||||||
color: currentTab === index ? Theme.primaryPressed : (tabMouseArea.containsMouse ? Theme.primaryHoverLight : "transparent")
|
color: currentTab === index ? Theme.primaryPressed : (tabMouseArea.containsMouse ? Theme.primaryHoverLight : "transparent")
|
||||||
border.color: currentTab === index ? Theme.primary : "transparent"
|
border.color: currentTab === index ? Theme.primary : "transparent"
|
||||||
border.width: currentTab === index ? 1 : 0
|
border.width: currentTab === index ? 1 : 0
|
||||||
|
|
||||||
Row {
|
Row {
|
||||||
|
id: tabRowContent
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
spacing: Theme.spacingXS
|
spacing: Theme.spacingXS
|
||||||
|
|
||||||
@@ -373,11 +374,13 @@ FloatingWindow {
|
|||||||
|
|
||||||
DankButtonGroup {
|
DankButtonGroup {
|
||||||
id: processFilterGroup
|
id: processFilterGroup
|
||||||
Layout.minimumWidth: implicitWidth + 8
|
|
||||||
model: [I18n.tr("All"), I18n.tr("User"), I18n.tr("System")]
|
model: [I18n.tr("All"), I18n.tr("User"), I18n.tr("System")]
|
||||||
currentIndex: 0
|
currentIndex: 0
|
||||||
checkEnabled: false
|
checkEnabled: false
|
||||||
buttonHeight: 36
|
buttonHeight: Math.round(Theme.fontSizeSmall * 2.6)
|
||||||
|
minButtonWidth: 0
|
||||||
|
buttonPadding: Theme.spacingS
|
||||||
|
textSize: Theme.fontSizeSmall
|
||||||
visible: currentTab === 0
|
visible: currentTab === 0
|
||||||
onSelectionChanged: (index, selected) => {
|
onSelectionChanged: (index, selected) => {
|
||||||
if (!selected)
|
if (!selected)
|
||||||
@@ -400,9 +403,9 @@ FloatingWindow {
|
|||||||
DankTextField {
|
DankTextField {
|
||||||
id: searchField
|
id: searchField
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.maximumWidth: 250
|
Layout.maximumWidth: Math.round(Theme.fontSizeMedium * 18)
|
||||||
Layout.minimumWidth: 120
|
Layout.minimumWidth: Theme.fontSizeMedium * 4
|
||||||
Layout.preferredHeight: 40
|
Layout.preferredHeight: Math.round(Theme.fontSizeMedium * 2.8)
|
||||||
placeholderText: I18n.tr("Search processes...", "process search placeholder")
|
placeholderText: I18n.tr("Search processes...", "process search placeholder")
|
||||||
leftIconName: "search"
|
leftIconName: "search"
|
||||||
showClearButton: true
|
showClearButton: true
|
||||||
@@ -470,7 +473,7 @@ FloatingWindow {
|
|||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.preferredHeight: 32
|
Layout.preferredHeight: Math.round(Theme.fontSizeSmall * 2.7)
|
||||||
Layout.leftMargin: Theme.spacingL
|
Layout.leftMargin: Theme.spacingL
|
||||||
Layout.rightMargin: Theme.spacingL
|
Layout.rightMargin: Theme.spacingL
|
||||||
Layout.bottomMargin: Theme.spacingM
|
Layout.bottomMargin: Theme.spacingM
|
||||||
|
|||||||
@@ -26,8 +26,8 @@ DankPopout {
|
|||||||
open();
|
open();
|
||||||
}
|
}
|
||||||
|
|
||||||
popupWidth: 650
|
popupWidth: Math.round(Theme.fontSizeMedium * 46)
|
||||||
popupHeight: 550
|
popupHeight: Math.round(Theme.fontSizeMedium * 39)
|
||||||
triggerWidth: 55
|
triggerWidth: 55
|
||||||
positioning: ""
|
positioning: ""
|
||||||
screen: triggerScreen
|
screen: triggerScreen
|
||||||
@@ -151,11 +151,13 @@ DankPopout {
|
|||||||
|
|
||||||
DankButtonGroup {
|
DankButtonGroup {
|
||||||
id: processFilterGroup
|
id: processFilterGroup
|
||||||
Layout.minimumWidth: implicitWidth + 8
|
Layout.minimumWidth: implicitWidth
|
||||||
model: [I18n.tr("All"), I18n.tr("User"), I18n.tr("System")]
|
model: [I18n.tr("All"), I18n.tr("User"), I18n.tr("System")]
|
||||||
currentIndex: 0
|
currentIndex: 0
|
||||||
checkEnabled: false
|
checkEnabled: false
|
||||||
buttonHeight: Math.round(Theme.fontSizeMedium * 2.2)
|
buttonHeight: Math.round(Theme.fontSizeSmall * 2.4)
|
||||||
|
minButtonWidth: 0
|
||||||
|
buttonPadding: Theme.spacingM
|
||||||
textSize: Theme.fontSizeSmall
|
textSize: Theme.fontSizeSmall
|
||||||
onSelectionChanged: (index, selected) => {
|
onSelectionChanged: (index, selected) => {
|
||||||
if (!selected)
|
if (!selected)
|
||||||
@@ -177,7 +179,8 @@ DankPopout {
|
|||||||
|
|
||||||
DankTextField {
|
DankTextField {
|
||||||
id: searchField
|
id: searchField
|
||||||
Layout.preferredWidth: Theme.fontSizeMedium * 14
|
Layout.fillWidth: true
|
||||||
|
Layout.minimumWidth: Theme.fontSizeMedium * 8
|
||||||
Layout.preferredHeight: Theme.fontSizeMedium * 2.5
|
Layout.preferredHeight: Theme.fontSizeMedium * 2.5
|
||||||
placeholderText: I18n.tr("Search...")
|
placeholderText: I18n.tr("Search...")
|
||||||
leftIconName: "search"
|
leftIconName: "search"
|
||||||
|
|||||||
Reference in New Issue
Block a user