From 463c18f9fafefb49c22394a43886c32cacf39ab7 Mon Sep 17 00:00:00 2001 From: Fushan Wen Date: Sat, 9 Sep 2023 10:45:08 +0800 Subject: [PATCH] thumbnail_grid: allow screen reader to announce window name when pressing Alt+Tab CCBUG: 472643 --- .../switchers/thumbnail_grid/contents/ui/main.qml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/tabbox/switchers/thumbnail_grid/contents/ui/main.qml b/src/tabbox/switchers/thumbnail_grid/contents/ui/main.qml index 614e5e058b..5c35ffd8ba 100644 --- a/src/tabbox/switchers/thumbnail_grid/contents/ui/main.qml +++ b/src/tabbox/switchers/thumbnail_grid/contents/ui/main.qml @@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.0 +import QtQuick import QtQuick.Layouts 1.1 import org.kde.plasma.core as PlasmaCore import org.kde.ksvg 1.0 as KSvg @@ -96,7 +96,7 @@ KWin.TabBoxSwitcher { GridView { id: thumbnailGridView anchors.fill: parent - + focus: true model: tabBox.model readonly property int iconSize: Kirigami.Units.iconSizes.huge @@ -114,7 +114,10 @@ KWin.TabBoxSwitcher { id: thumbnailGridItem width: thumbnailGridView.cellWidth height: thumbnailGridView.cellHeight - readonly property bool isCurrentItem: GridView.isCurrentItem + focus: GridView.isCurrentItem + + Accessible.name: model.caption + Accessible.role: Accessible.ListItem MouseArea { id: mouseArea @@ -173,7 +176,7 @@ KWin.TabBoxSwitcher { visible: model.closeable && typeof tabBox.model.close !== 'undefined' && (mouseArea.containsMouse || closeButton.hovered - || thumbnailGridItem.isCurrentItem + || thumbnailGridItem.focus || Kirigami.Settings.tabletMode || Kirigami.Settings.hasTransientTouchInput ) @@ -187,7 +190,7 @@ KWin.TabBoxSwitcher { PlasmaComponents3.Label { Layout.fillWidth: true text: model.caption - font.weight: thumbnailGridItem.isCurrentItem ? Font.Bold : Font.Normal + font.weight: thumbnailGridItem.focus ? Font.Bold : Font.Normal horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter textFormat: Text.PlainText