mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-06-18 17:15:20 -04:00
running apps: fix blurred tooltips
This commit is contained in:
@@ -18,6 +18,14 @@ BasePill {
|
|||||||
|
|
||||||
property var widgetData: null
|
property var widgetData: null
|
||||||
property var hoveredItem: null
|
property var hoveredItem: null
|
||||||
|
|
||||||
|
onHoveredItemChanged: {
|
||||||
|
if (hoveredItem)
|
||||||
|
return;
|
||||||
|
if (tooltipLoader.item)
|
||||||
|
tooltipLoader.item.hide();
|
||||||
|
tooltipLoader.active = false;
|
||||||
|
}
|
||||||
property var topBar: null
|
property var topBar: null
|
||||||
property bool isAutoHideBar: false
|
property bool isAutoHideBar: false
|
||||||
property Item windowRoot: (Window.window ? Window.window.contentItem : null)
|
property Item windowRoot: (Window.window ? Window.window.contentItem : null)
|
||||||
@@ -236,6 +244,11 @@ BasePill {
|
|||||||
delegate: Item {
|
delegate: Item {
|
||||||
id: delegateItem
|
id: delegateItem
|
||||||
|
|
||||||
|
Component.onDestruction: {
|
||||||
|
if (root.hoveredItem === delegateItem)
|
||||||
|
root.hoveredItem = null;
|
||||||
|
}
|
||||||
|
|
||||||
property bool isGrouped: root._groupByApp
|
property bool isGrouped: root._groupByApp
|
||||||
property var groupData: isGrouped ? modelData : null
|
property var groupData: isGrouped ? modelData : null
|
||||||
property var toplevelData: isGrouped ? (modelData.windows.length > 0 ? modelData.windows[0].toplevel : null) : modelData
|
property var toplevelData: isGrouped ? (modelData.windows.length > 0 ? modelData.windows[0].toplevel : null) : modelData
|
||||||
@@ -461,14 +474,8 @@ BasePill {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
onExited: {
|
onExited: {
|
||||||
if (root.hoveredItem === delegateItem) {
|
if (root.hoveredItem === delegateItem)
|
||||||
root.hoveredItem = null;
|
root.hoveredItem = null;
|
||||||
if (tooltipLoader.item) {
|
|
||||||
tooltipLoader.item.hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
tooltipLoader.active = false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -491,6 +498,11 @@ BasePill {
|
|||||||
delegate: Item {
|
delegate: Item {
|
||||||
id: delegateItem
|
id: delegateItem
|
||||||
|
|
||||||
|
Component.onDestruction: {
|
||||||
|
if (root.hoveredItem === delegateItem)
|
||||||
|
root.hoveredItem = null;
|
||||||
|
}
|
||||||
|
|
||||||
property bool isGrouped: root._groupByApp
|
property bool isGrouped: root._groupByApp
|
||||||
property var groupData: isGrouped ? modelData : null
|
property var groupData: isGrouped ? modelData : null
|
||||||
property var toplevelData: isGrouped ? (modelData.windows.length > 0 ? modelData.windows[0].toplevel : null) : modelData
|
property var toplevelData: isGrouped ? (modelData.windows.length > 0 ? modelData.windows[0].toplevel : null) : modelData
|
||||||
@@ -715,14 +727,8 @@ BasePill {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
onExited: {
|
onExited: {
|
||||||
if (root.hoveredItem === delegateItem) {
|
if (root.hoveredItem === delegateItem)
|
||||||
root.hoveredItem = null;
|
root.hoveredItem = null;
|
||||||
if (tooltipLoader.item) {
|
|
||||||
tooltipLoader.item.hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
tooltipLoader.active = false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ import QtQuick
|
|||||||
import Quickshell
|
import Quickshell
|
||||||
import Quickshell.Wayland
|
import Quickshell.Wayland
|
||||||
import qs.Common
|
import qs.Common
|
||||||
|
import qs.Services
|
||||||
|
import qs.Widgets
|
||||||
|
|
||||||
PanelWindow {
|
PanelWindow {
|
||||||
id: root
|
id: root
|
||||||
@@ -69,12 +71,21 @@ PanelWindow {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
WindowBlur {
|
||||||
|
targetWindow: root
|
||||||
|
blurX: 0
|
||||||
|
blurY: 0
|
||||||
|
blurWidth: root.visible ? root.width : 0
|
||||||
|
blurHeight: root.visible ? root.height : 0
|
||||||
|
blurRadius: Theme.cornerRadius
|
||||||
|
}
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
||||||
radius: Theme.cornerRadius
|
radius: Theme.cornerRadius
|
||||||
border.width: 1
|
border.width: BlurService.enabled ? BlurService.borderWidth : 1
|
||||||
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
|
border.color: BlurService.enabled ? BlurService.borderColor : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
|
||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
id: textContent
|
id: textContent
|
||||||
|
|||||||
Reference in New Issue
Block a user