mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-08-04 12:38:31 -04:00
Compare commits
88 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6306bc7aa2 | |||
| eca92898f9 | |||
| db9fb0bd90 | |||
| 815820aa27 | |||
| 01c0ed2778 | |||
| 9967db0c5a | |||
| 883a787db7 | |||
| 3b1a3c1c22 | |||
| 970262f276 | |||
| b708e97ec5 | |||
| e94fc7fe99 | |||
| c4bca6f6cd | |||
| 9e7fc833e9 | |||
| 9e2d493749 | |||
| 93120fd73b | |||
| 536ebf7b0a | |||
| 1105047a80 | |||
| 8b46397200 | |||
| 6b70491ba9 | |||
| deb0138198 | |||
| 2e0587ca16 | |||
| 45cafc6bdb | |||
| 82d5081b7d | |||
| b5b083305f | |||
| 039d14c790 | |||
| ee7ac9d2bd | |||
| bd159be414 | |||
| 4dda0e3a5e | |||
| 724ee9422d | |||
| c91cb5d89a | |||
| 660953ebc5 | |||
| bd70a6286e | |||
| d87e2fcb01 | |||
| 928b272628 | |||
| 781ed16538 | |||
| 417da7408d | |||
| 0d550662de | |||
| 35e35a16fa | |||
| d96559f7df | |||
| 7f37799e53 | |||
| fcda17f517 | |||
| 4b05e7a0fa | |||
| 7c6ad65b5a | |||
| acda199e28 | |||
| b3a129af2f | |||
| e9d958b32b | |||
| dd9edd8a00 | |||
| 28c25d46d5 | |||
| 58530ae56c | |||
| c0134c249a | |||
| f7157f0e92 | |||
| e29b9749df | |||
| 6791c20f40 | |||
| 6c2572fbfe | |||
| 3ee07f7f20 | |||
| ef244cb645 | |||
| 860c347362 | |||
| c7b58e52d7 | |||
| e0fb817a75 | |||
| b5908f4d1b | |||
| ee6c91e094 | |||
| 59d367f4a4 | |||
| ee84489b95 | |||
| b1beecb083 | |||
| ffd3840058 | |||
| 447b4d89b6 | |||
| 36772735f3 | |||
| 375afaaf3a | |||
| fe0214d522 | |||
| fce1a09790 | |||
| 554e55c63a | |||
| f7d8e2b56c | |||
| 1d4572ac1c | |||
| c02a24fecf | |||
| bf644516f8 | |||
| 61f9ea4954 | |||
| 5a169bea72 | |||
| 3d60f35683 | |||
| b95f4cdbf3 | |||
| b834e82668 | |||
| 302cfda2f4 | |||
| c86676df9b | |||
| fa26dbb544 | |||
| 067d01f678 | |||
| 95c8cc80f6 | |||
| b8f216dc0f | |||
| e84e63fa3a | |||
| 6d08b91004 |
+1
-1
@@ -1 +1 @@
|
|||||||
Marble Tabby
|
The Wolverine
|
||||||
|
|||||||
@@ -1752,7 +1752,11 @@ BasePill {
|
|||||||
id: trayMenuContainer
|
id: trayMenuContainer
|
||||||
|
|
||||||
readonly property real rawWidth: Math.min(500, Math.max(250, menuColumn.implicitWidth + Theme.spacingS * 2))
|
readonly property real rawWidth: Math.min(500, Math.max(250, menuColumn.implicitWidth + Theme.spacingS * 2))
|
||||||
readonly property real rawHeight: Math.max(40, menuColumn.implicitHeight + Theme.spacingS * 2)
|
readonly property real rawHeight: {
|
||||||
|
const desiredHeight = Math.max(40, menuColumn.implicitHeight + Theme.spacingS * 2);
|
||||||
|
const maxHeight = Math.max(40, menuWindow.maskHeight - 20);
|
||||||
|
return Math.min(desiredHeight, maxHeight);
|
||||||
|
}
|
||||||
|
|
||||||
readonly property real alignedWidth: Theme.px(rawWidth, menuWindow.dpr)
|
readonly property real alignedWidth: Theme.px(rawWidth, menuWindow.dpr)
|
||||||
readonly property real alignedHeight: Theme.px(rawHeight, menuWindow.dpr)
|
readonly property real alignedHeight: Theme.px(rawHeight, menuWindow.dpr)
|
||||||
@@ -1852,13 +1856,19 @@ BasePill {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
DankFlickable {
|
||||||
|
id: menuFlickable
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.margins: Theme.spacingS
|
||||||
|
contentWidth: width
|
||||||
|
contentHeight: menuColumn.implicitHeight
|
||||||
|
clip: true
|
||||||
|
interactive: contentHeight > height
|
||||||
|
|
||||||
Column {
|
Column {
|
||||||
id: menuColumn
|
id: menuColumn
|
||||||
|
|
||||||
width: parent.width - Theme.spacingS * 2
|
width: menuFlickable.width
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
|
||||||
anchors.top: parent.top
|
|
||||||
anchors.topMargin: Theme.spacingS
|
|
||||||
spacing: 1
|
spacing: 1
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
@@ -1881,7 +1891,7 @@ BasePill {
|
|||||||
font.pixelSize: Theme.fontSizeSmall
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
color: Theme.surfaceTextMedium
|
color: Theme.surfaceTextMedium
|
||||||
elide: Text.ElideMiddle
|
elide: Text.ElideMiddle
|
||||||
width: parent.width - Theme.spacingS * 2 - 24
|
width: parent.width - Theme.spacingS * 2 - (Theme.iconSizeSmall + Theme.spacingS)
|
||||||
}
|
}
|
||||||
|
|
||||||
DankIcon {
|
DankIcon {
|
||||||
@@ -1893,7 +1903,7 @@ BasePill {
|
|||||||
return "push_pin";
|
return "push_pin";
|
||||||
return root.isManualHiddenTrayItem(menuRoot.trayItem) ? "visibility" : "visibility_off";
|
return root.isManualHiddenTrayItem(menuRoot.trayItem) ? "visibility" : "visibility_off";
|
||||||
}
|
}
|
||||||
size: 16
|
size: Theme.iconSizeSmall
|
||||||
color: Theme.widgetTextColor
|
color: Theme.widgetTextColor
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1940,7 +1950,7 @@ BasePill {
|
|||||||
|
|
||||||
DankIcon {
|
DankIcon {
|
||||||
name: "arrow_back"
|
name: "arrow_back"
|
||||||
size: 16
|
size: Theme.iconSizeSmall
|
||||||
color: Theme.widgetTextColor
|
color: Theme.widgetTextColor
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
}
|
}
|
||||||
@@ -2018,11 +2028,11 @@ BasePill {
|
|||||||
visible: !menuEntry?.isSeparator
|
visible: !menuEntry?.isSeparator
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
width: 16
|
width: Theme.iconSizeSmall
|
||||||
height: 16
|
height: Theme.iconSizeSmall
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
visible: menuEntry?.buttonType !== undefined && menuEntry.buttonType !== 0
|
visible: menuEntry?.buttonType !== undefined && menuEntry.buttonType !== 0
|
||||||
radius: menuEntry?.buttonType === 2 ? 8 : 2
|
radius: menuEntry?.buttonType === 2 ? width / 2 : 2
|
||||||
border.width: 1
|
border.width: 1
|
||||||
border.color: Theme.outline
|
border.color: Theme.outline
|
||||||
color: "transparent"
|
color: "transparent"
|
||||||
@@ -2039,23 +2049,23 @@ BasePill {
|
|||||||
DankIcon {
|
DankIcon {
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
name: "check"
|
name: "check"
|
||||||
size: 10
|
size: Theme.iconSizeSmall - 6
|
||||||
color: Theme.primaryText
|
color: Theme.primaryText
|
||||||
visible: menuEntry?.buttonType === 1 && menuEntry?.checkState === 2
|
visible: menuEntry?.buttonType === 1 && menuEntry?.checkState === 2
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
width: 16
|
width: Theme.iconSizeSmall
|
||||||
height: 16
|
height: Theme.iconSizeSmall
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
visible: (menuEntry?.icon ?? "") !== ""
|
visible: (menuEntry?.icon ?? "") !== ""
|
||||||
|
|
||||||
Image {
|
Image {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
source: menuEntry?.icon || ""
|
source: menuEntry?.icon || ""
|
||||||
sourceSize.width: 16
|
sourceSize.width: Theme.iconSizeSmall
|
||||||
sourceSize.height: 16
|
sourceSize.height: Theme.iconSizeSmall
|
||||||
fillMode: Image.PreserveAspectFit
|
fillMode: Image.PreserveAspectFit
|
||||||
smooth: true
|
smooth: true
|
||||||
}
|
}
|
||||||
@@ -2072,14 +2082,14 @@ BasePill {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
width: 16
|
width: Theme.iconSizeSmall
|
||||||
height: 16
|
height: Theme.iconSizeSmall
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
|
||||||
DankIcon {
|
DankIcon {
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
name: "chevron_right"
|
name: "chevron_right"
|
||||||
size: 14
|
size: Theme.iconSizeSmall - 2
|
||||||
color: Theme.widgetTextColor
|
color: Theme.widgetTextColor
|
||||||
visible: menuEntry?.hasChildren ?? false
|
visible: menuEntry?.hasChildren ?? false
|
||||||
}
|
}
|
||||||
@@ -2092,6 +2102,7 @@ BasePill {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function showForTrayItem(item, anchor, screen, atBottom, vertical, axisObj) {
|
function showForTrayItem(item, anchor, screen, atBottom, vertical, axisObj) {
|
||||||
if (!screen)
|
if (!screen)
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ Singleton {
|
|||||||
readonly property var log: Log.scoped("ChangelogService")
|
readonly property var log: Log.scoped("ChangelogService")
|
||||||
|
|
||||||
readonly property string currentVersion: "1.5"
|
readonly property string currentVersion: "1.5"
|
||||||
readonly property bool changelogEnabled: false
|
readonly property bool changelogEnabled: true
|
||||||
|
|
||||||
readonly property string configDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation)) + "/DankMaterialShell"
|
readonly property string configDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation)) + "/DankMaterialShell"
|
||||||
readonly property string changelogMarkerPath: configDir + "/.changelog-" + currentVersion
|
readonly property string changelogMarkerPath: configDir + "/.changelog-" + currentVersion
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
v1.6-beta
|
v1.5.1
|
||||||
|
|||||||
Reference in New Issue
Block a user