kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-26 23:21:37 +03:00
Code Issues Projects Releases Wiki Activity

decouple ShortcutBadge from taskItem and root

Browse Source
This commit is contained in:
Michail Vourlakos 2021-01-31 11:19:24 +02:00
parent 2b29662706
commit 815bd9d799
3 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plasmoid/package/contents/ui/task/BasicItem.qml
View File

@ -103,6 +103,7 @@ Item{
readonly property bool isVertical: plasmoid.formFactor === PlasmaCore.Types.Vertical readonly property bool isVertical: plasmoid.formFactor === PlasmaCore.Types.Vertical
readonly property bool parabolicAreaContainsMouse: parabolicEventsAreaLoader.active && parabolicEventsAreaLoader.item.containsMouse readonly property bool parabolicAreaContainsMouse: parabolicEventsAreaLoader.active && parabolicEventsAreaLoader.item.containsMouse
readonly property int itemIndex: index
readonly property int animationTime: (abilityItem.abilities.animations.active ? abilityItem.abilities.animations.speedFactor.current : 2) * (1.2 * abilityItem.abilities.animations.duration.small) readonly property int animationTime: (abilityItem.abilities.animations.active ? abilityItem.abilities.animations.speedFactor.current : 2) * (1.2 * abilityItem.abilities.animations.duration.small)
readonly property int iconOffsetX: indicatorBackLayer.level.requested.iconOffsetX readonly property int iconOffsetX: indicatorBackLayer.level.requested.iconOffsetX
readonly property int iconOffsetY: indicatorBackLayer.level.requested.iconOffsetY readonly property int iconOffsetY: indicatorBackLayer.level.requested.iconOffsetY

44
plasmoid/package/contents/ui/task/ShortcutBadge.qml
View File

@ -20,45 +20,59 @@
import QtQuick 2.7 import QtQuick 2.7
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import org.kde.plasma.plasmoid 2.0
import org.kde.latte.components 1.0 as LatteComponents import org.kde.latte.components 1.0 as LatteComponents
Loader{ Loader{
id: shorcutBadge id: shorcutBadge
active: taskItem.abilities.shortcuts.showPositionShortcutBadges && !taskItem.isSeparator && !taskItem.isHidden && taskItem.abilities.shortcuts.isEnabled active: abilityItem.abilities.shortcuts.showPositionShortcutBadges && !abilityItem.isSeparator && !abilityItem.isHidden && abilityItem.abilities.shortcuts.isEnabled
asynchronous: true asynchronous: true
visible: badgeString !== "" visible: badgeString !== ""
property int fixedIndex:-1 property int fixedIndex:-1
readonly property int maxFixedIndex: taskItem.abilities.shortcuts.badges.length
property string badgeString: (shorcutBadge.fixedIndex>=1 && shorcutBadge.fixedIndex<=maxFixedIndex) ? readonly property int maxFixedIndex: abilityItem.abilities.shortcuts.badges.length
taskItem.abilities.shortcuts.badges[shorcutBadge.fixedIndex-1] : "" readonly property real textColorBrightness: colorBrightness(theme.textColor)
readonly property string badgeString: (shorcutBadge.fixedIndex>=1 && shorcutBadge.fixedIndex<=maxFixedIndex) ?
abilityItem.abilities.shortcuts.badges[shorcutBadge.fixedIndex-1] : ""
readonly property color lightTextColor: textColorBrightness > 127.5 ? theme.textColor : theme.backgroundColor
onActiveChanged: updateShorcutIndex(); onActiveChanged: updateShorcutIndex();
Connections { Connections {
target: taskItem target: abilityItem
onItemIndexChanged: shortcutBadge.updateShorcutIndex(); onItemIndexChanged: shortcutBadge.updateShorcutIndex();
} }
function updateShorcutIndex() { function updateShorcutIndex() {
if (shorcutBadge.active && taskItem.abilities.shortcuts.showPositionShortcutBadges) { if (shorcutBadge.active && abilityItem.abilities.shortcuts.showPositionShortcutBadges) {
fixedIndex = taskItem.abilities.shortcuts.shortcutIndex(taskItem.itemIndex); fixedIndex = abilityItem.abilities.shortcuts.shortcutIndex(abilityItem.itemIndex);
} else { } else {
fixedIndex = -1; fixedIndex = -1;
} }
} }
function colorBrightness(color) {
return colorBrightnessFromRGB(color.r * 255, color.g * 255, color.b * 255);
}
// formula for brightness according to:
// https://www.w3.org/TR/AERT/#color-contrast
function colorBrightnessFromRGB(r, g, b) {
return (r * 299 + g * 587 + b * 114) / 1000
}
sourceComponent: Item{ sourceComponent: Item{
Loader{ Loader{
anchors.fill: taskNumber anchors.fill: taskNumber
active: taskItem.abilities.myView.itemShadow.isEnabled && graphicsSystem.isAccelerated active: abilityItem.abilities.myView.itemShadow.isEnabled && graphicsSystem.isAccelerated
sourceComponent: DropShadow{ sourceComponent: DropShadow{
color: taskItem.abilities.myView.itemShadow.shadowColor color: abilityItem.abilities.myView.itemShadow.shadowColor
fast: true fast: true
samples: 2 * radius samples: 2 * radius
source: taskNumber source: taskNumber
radius: taskItem.abilities.myView.itemShadow.size/2 radius: abilityItem.abilities.myView.itemShadow.size/2
verticalOffset: 2 verticalOffset: 2
} }
} }
@ -67,17 +81,17 @@ Loader{
id: taskNumber id: taskNumber
// when iconSize < 48, height is always = 24, height / iconSize > 50% // when iconSize < 48, height is always = 24, height / iconSize > 50%
// we prefer center aligned badges to top-left aligned ones // we prefer center aligned badges to top-left aligned ones
property bool centerInParent: taskItem.abilities.metrics.iconSize < 48 property bool centerInParent: abilityItem.abilities.metrics.iconSize < 48
anchors.left: centerInParent? undefined : parent.left anchors.left: centerInParent? undefined : parent.left
anchors.top: centerInParent? undefined : parent.top anchors.top: centerInParent? undefined : parent.top
anchors.centerIn: centerInParent? parent : undefined anchors.centerIn: centerInParent? parent : undefined
minimumWidth: 0.4 * (taskItem.parabolicItem.zoom * taskItem.abilities.metrics.iconSize) minimumWidth: 0.4 * (abilityItem.parabolicItem.zoom * abilityItem.abilities.metrics.iconSize)
height: Math.max(24, 0.4 * (taskItem.parabolicItem.zoom * taskItem.abilities.metrics.iconSize)) height: Math.max(24, 0.4 * (abilityItem.parabolicItem.zoom * abilityItem.abilities.metrics.iconSize))
style3d: taskItem.abilities.myView.badgesIn3DStyle style3d: abilityItem.abilities.myView.badgesIn3DStyle
textValue: shorcutBadge.badgeString textValue: shorcutBadge.badgeString
borderColor: root.lightTextColor borderColor: shortcutBadge.lightTextColor
showNumber: false showNumber: false
showText: true showText: true

1
plasmoid/package/contents/ui/task/TaskItem.qml
View File

@ -115,7 +115,6 @@ BasicItem {
property bool wheelIsBlocked: false property bool wheelIsBlocked: false
property int badgeIndicator: 0 //it is used from external apps property int badgeIndicator: 0 //it is used from external apps
property int itemIndex: index
property int lastValidIndex: -1 //used for the removal animation property int lastValidIndex: -1 //used for the removal animation
property int lastButtonClicked: -1; property int lastButtonClicked: -1;
property int pressX: -1 property int pressX: -1