kenji/illogical-impulse
1
0
Fork 0
forked from Shinonome/dots-hyprland
Code Pull Requests Activity

dock: fix hover area accuracy, less braindead styling

Browse Source
This commit is contained in:
end-4
2025-05-30 22:43:02 +02:00
parent 47a34dc76b
commit 138fc54392
1 changed files with 55 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.config/quickshell/modules/dock/DockApps.qml
+55 -61
View File
@@ -2,6 +2,7 @@ import "root:/"
import "root:/services" import "root:/services"
import "root:/modules/common" import "root:/modules/common"
import "root:/modules/common/widgets" import "root:/modules/common/widgets"
import "root:/modules/common/functions/color_utils.js" as ColorUtils
import Qt5Compat.GraphicalEffects import Qt5Compat.GraphicalEffects
import QtQuick import QtQuick
import QtQuick.Controls import QtQuick.Controls
@@ -17,11 +18,12 @@ Item {
id: root id: root
property real maxWindowPreviewHeight: 200 property real maxWindowPreviewHeight: 200
property real maxWindowPreviewWidth: 300 property real maxWindowPreviewWidth: 300
property real windowControlsHeight: 30
property Item lastHoveredButton property Item lastHoveredButton
property bool buttonHovered: false property bool buttonHovered: false
property bool requestDockShow: previewPopup.show property bool requestDockShow: previewPopup.show
property real popupX: 0 property real popupX: parentWindow.mapFromItem(root.lastHoveredButton, root.lastHoveredButton.width / 2, root.lastHoveredButton.height / 2).x - implicitWidth / 2
implicitWidth: rowLayout.implicitWidth implicitWidth: rowLayout.implicitWidth
implicitHeight: rowLayout.implicitHeight implicitHeight: rowLayout.implicitHeight
@@ -101,30 +103,31 @@ Item {
} }
anchor { anchor {
window: root.QsWindow.window window: root.QsWindow.window
rect: { adjustment: PopupAdjustment.None
if (root.lastHoveredButton === null) return; // Don't update gravity: Edges.Top | Edges.Right
const parentWindow = root.QsWindow.window edges: Edges.Top | Edges.Left
const mappedPosition = parentWindow.mapFromItem(root.lastHoveredButton, root.lastHoveredButton.width / 2, root.lastHoveredButton.height / 2)
const modifiedX = mappedPosition.x - implicitWidth / 2
root.popupX = modifiedX
const modifiedY = 0
return Qt.rect(modifiedX, modifiedY, implicitWidth, implicitHeight)
}
gravity: Edges.Top
edges: Edges.Top
} }
visible: popupBackground.visible visible: popupBackground.visible
color: "transparent" color: "transparent"
implicitWidth: root.QsWindow.window?.width ?? 1 implicitWidth: root.QsWindow.window?.width ?? 1
implicitHeight: popupMouseArea.implicitHeight + Appearance.sizes.elevationMargin * 2 implicitHeight: popupMouseArea.implicitHeight + root.windowControlsHeight + Appearance.sizes.elevationMargin * 2
MouseArea { MouseArea {
id: popupMouseArea id: popupMouseArea
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
implicitWidth: popupBackground.implicitWidth + Appearance.sizes.elevationMargin * 2 implicitWidth: popupBackground.implicitWidth + Appearance.sizes.elevationMargin * 2
implicitHeight: root.maxWindowPreviewHeight + Appearance.sizes.elevationMargin * 2 implicitHeight: root.maxWindowPreviewHeight + root.windowControlsHeight + Appearance.sizes.elevationMargin * 2
anchors.horizontalCenter: parent.horizontalCenter // anchors.horizontalCenter: parent.horizontalCenter
hoverEnabled: true hoverEnabled: true
// x: previewPopup.width / 2 + root.popupX
// Behavior on x {
// animation: Appearance.animation.elementMove.numberAnimation.createObject(this)
// }
x: {
const itemCenter = root.QsWindow.mapFromItem(root.lastHoveredButton, root.lastHoveredButton.width / 2, 0);
return itemCenter.x - width / 2
}
StyledRectangularShadow { StyledRectangularShadow {
target: popupBackground target: popupBackground
opacity: previewPopup.show ? 1 : 0 opacity: previewPopup.show ? 1 : 0
@@ -142,16 +145,13 @@ Item {
animation: Appearance.animation.elementMoveFast.numberAnimation.createObject(this) animation: Appearance.animation.elementMoveFast.numberAnimation.createObject(this)
} }
clip: true clip: true
color: Appearance.colors.colLayer1 color: Appearance.m3colors.m3surfaceContainer
radius: Appearance.rounding.normal radius: Appearance.rounding.normal
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: Appearance.sizes.elevationMargin anchors.bottomMargin: Appearance.sizes.elevationMargin
anchors.horizontalCenter: parent.horizontalCenter
implicitHeight: previewRowLayout.implicitHeight + padding * 2 implicitHeight: previewRowLayout.implicitHeight + padding * 2
implicitWidth: previewRowLayout.implicitWidth + padding * 2 implicitWidth: previewRowLayout.implicitWidth + padding * 2
x: root.popupX
Behavior on x {
animation: Appearance.animation.elementMove.numberAnimation.createObject(this)
}
Behavior on implicitWidth { Behavior on implicitWidth {
animation: Appearance.animation.elementMoveFast.numberAnimation.createObject(this) animation: Appearance.animation.elementMoveFast.numberAnimation.createObject(this)
} }
@@ -174,12 +174,45 @@ Item {
onClicked: { onClicked: {
windowButton.modelData?.activate(); windowButton.modelData?.activate();
} }
contentItem: Item { contentItem: ColumnLayout {
implicitWidth: screencopyView.implicitWidth implicitWidth: screencopyView.implicitWidth
implicitHeight: screencopyView.implicitHeight implicitHeight: screencopyView.implicitHeight
ButtonGroup {
contentWidth: parent.width - anchors.margins * 2
WrapperRectangle {
Layout.fillWidth: true
color: ColorUtils.transparentize(Appearance.m3colors.m3surfaceContainer)
radius: Appearance.rounding.small
margin: 5
StyledText {
Layout.fillWidth: true
font.pixelSize: Appearance.font.pixelSize.small
text: windowButton.modelData?.title
elide: Text.ElideRight
color: Appearance.m3colors.m3onSurface
}
}
GroupButton {
id: closeButton
colBackground: ColorUtils.transparentize(Appearance.m3colors.m3surfaceContainer)
baseWidth: windowControlsHeight
baseHeight: windowControlsHeight
buttonRadius: Appearance.rounding.full
contentItem: MaterialSymbol {
anchors.centerIn: parent
horizontalAlignment: Text.AlignHCenter
text: "close"
iconSize: Appearance.font.pixelSize.normal
color: Appearance.m3colors.m3onSurface
}
onClicked: {
windowButton.modelData?.close();
}
}
}
ScreencopyView { ScreencopyView {
id: screencopyView id: screencopyView
anchors.centerIn: parent
captureSource: previewPopup ? windowButton.modelData : null captureSource: previewPopup ? windowButton.modelData : null
live: true live: true
paintCursor: true paintCursor: true
@@ -196,45 +229,6 @@ Item {
} }
} }
} }
ButtonGroup {
contentWidth: parent.width - anchors.margins * 2
anchors {
top: parent.top
left: parent.left
right: parent.right
margins: 3
}
WrapperRectangle {
Layout.fillWidth: true
color: Appearance.m3colors.m3surfaceContainer
radius: Appearance.rounding.small
margin: 5
StyledText {
Layout.fillWidth: true
font.pixelSize: Appearance.font.pixelSize.small
text: windowButton.modelData?.title
elide: Text.ElideRight
color: Appearance.m3colors.m3onSurface
}
}
GroupButton {
id: closeButton
colBackground: Appearance.m3colors.m3surfaceContainer
baseWidth: 30
baseHeight: 30
buttonRadius: Appearance.rounding.full
contentItem: MaterialSymbol {
anchors.centerIn: parent
horizontalAlignment: Text.AlignHCenter
text: "close"
iconSize: Appearance.font.pixelSize.normal
color: Appearance.m3colors.m3onSurface
}
onClicked: {
windowButton.modelData?.close();
}
}
}
} }
} }
} }