Skip to content

fix: size tooltips from window geometry #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
77x7 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: size tooltips from window geometry #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 68 additions & 5 deletions package/contents/ui/ToolTipDelegate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,64 @@ Loader {

readonly property bool isVerticalPanel: tasks.vertical
readonly property int tooltipInstanceMaximumWidth: Kirigami.Units.gridUnit * 14
readonly property rect tooltipScreenGeometry: Plasmoid.containment?.screenGeometry ?? Qt.rect(0, 0, 0, 0)
readonly property bool hasValidTooltipScreenGeometry: tooltipScreenGeometry.width > 0 && tooltipScreenGeometry.height > 0
property real tooltipThumbnailAspectRatio: 16 / 9
readonly property int tooltipThumbnailHeight: Math.round(tooltipInstanceMaximumWidth / tooltipThumbnailAspectRatio)

function updateTooltipThumbnailAspectRatio(): void {
const model = toolTipDelegate.tasksModel;
const currentRootIndex = toolTipDelegate.rootIndex;
if (!model || currentRootIndex === undefined || !currentRootIndex.valid) {
toolTipDelegate.tooltipThumbnailAspectRatio = 16 / 9;
return;
}

const ratios = [];
const appendGeometryRatio = modelIndex => {
const geometry = model.data(modelIndex, TaskManager.AbstractTasksModel.Geometry);
if (geometry && geometry.width > 0 && geometry.height > 0) {
ratios.push(geometry.width / geometry.height);
}
};

if (toolTipDelegate.isGroup) {
for (let index = 0; index < toolTipDelegate.windows.length; ++index) {
appendGeometryRatio(model.makeModelIndex(currentRootIndex.row, index));
}
} else {
appendGeometryRatio(currentRootIndex);
}

if (ratios.length === 0) {
toolTipDelegate.tooltipThumbnailAspectRatio = 16 / 9;
return;
}

ratios.sort((left, right) => left - right);
const middle = Math.floor(ratios.length / 2);
const medianRatio = ratios.length % 2 === 1
? ratios[middle]
: Math.sqrt(ratios[middle - 1] * ratios[middle]);
toolTipDelegate.tooltipThumbnailAspectRatio = Math.max(1, Math.min(2, medianRatio));
}

onRootIndexChanged: updateTooltipThumbnailAspectRatio()
onWindowsChanged: updateTooltipThumbnailAspectRatio()
onIsGroupChanged: updateTooltipThumbnailAspectRatio()
onTasksModelChanged: updateTooltipThumbnailAspectRatio()

Connections {
target: toolTipDelegate.parentTask

function onToolTipOpenChanged(): void {
if (toolTipDelegate.parentTask.toolTipOpen) {
toolTipDelegate.updateTooltipThumbnailAspectRatio();
}
}
}

Component.onCompleted: updateTooltipThumbnailAspectRatio()

property bool forceTextMode: false

Expand Down Expand Up @@ -309,6 +367,9 @@ Loader {
readonly property var config: toolTipDelegate.config
readonly property var parentTask: toolTipDelegate.parentTask
readonly property int tooltipInstanceMaximumWidth: toolTipDelegate.tooltipInstanceMaximumWidth
readonly property int tooltipThumbnailHeight: toolTipDelegate.tooltipThumbnailHeight
readonly property rect tooltipScreenGeometry: toolTipDelegate.tooltipScreenGeometry
readonly property bool hasValidTooltipScreenGeometry: toolTipDelegate.hasValidTooltipScreenGeometry
readonly property var windows: toolTipDelegate.windows
readonly property bool isVerticalPanel: toolTipDelegate.isVerticalPanel

Expand All @@ -331,8 +392,12 @@ Loader {
spacing: Kirigami.Units.smallSpacing

readonly property int safeCount: groupRoot.isWin ? groupRoot.windows.length : 1
readonly property int maxTooltipWidth: Screen.width - Kirigami.Units.gridUnit * 2
readonly property int maxTooltipHeight: Screen.height - Kirigami.Units.gridUnit * 2
readonly property int maxTooltipWidth: (groupRoot.hasValidTooltipScreenGeometry
? groupRoot.tooltipScreenGeometry.width
: Screen.width) - Kirigami.Units.gridUnit * 2
readonly property int maxTooltipHeight: (groupRoot.hasValidTooltipScreenGeometry
? groupRoot.tooltipScreenGeometry.height
: Screen.height) - Kirigami.Units.gridUnit * 2
readonly property real contentTargetWidth: {
// Use same logic as DelegateModel
const count = (!groupRoot.showThumbnails || groupRoot.isVerticalPanel) ? 1 : safeCount;
Expand Down Expand Up @@ -436,11 +501,9 @@ Loader {

readonly property int safeCount: groupRoot.isWin ? groupRoot.windows.length : count

readonly property real screenRatio: Screen.width / Screen.height

// If thumbnails disabled -> height is 0
readonly property int instanceThumbHeight: groupRoot.showThumbnails ?
Math.round(groupRoot.tooltipInstanceMaximumWidth / screenRatio) : 0
groupRoot.tooltipThumbnailHeight : 0

// Reduced padding for overlay style (was * 3)
// Fallback to 2 grid units for Text Mode items
Expand Down
5 changes: 3 additions & 2 deletions package/contents/ui/ToolTipInstance.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ Item {
readonly property var icon: toolTipDelegate ? toolTipDelegate.icon : null
readonly property var thumbnailCache: toolTipDelegate ? toolTipDelegate.thumbnailCache : null
readonly property int tooltipInstanceMaximumWidth: toolTipDelegate ? toolTipDelegate.tooltipInstanceMaximumWidth : Kirigami.Units.gridUnit * 14
readonly property int tooltipThumbnailHeight: toolTipDelegate ? toolTipDelegate.tooltipThumbnailHeight : Math.round(tooltipInstanceMaximumWidth * 9 / 16)

implicitWidth: mainLayout.implicitWidth
implicitHeight: mainLayout.implicitHeight
Expand Down Expand Up @@ -367,8 +368,8 @@ Item {
Item {
id: thumbnailSourceItem

readonly property int targetWidth: Kirigami.Units.gridUnit * 14
readonly property int targetHeight: Math.round(targetWidth / (Screen.width / Screen.height))
readonly property int targetWidth: root.tooltipInstanceMaximumWidth
readonly property int targetHeight: root.tooltipThumbnailHeight

Layout.preferredWidth: root.showThumbnails ? targetWidth : 0
Layout.preferredHeight: root.showThumbnails ? targetHeight : 0
Expand Down