File 0002-Window-Desktop-Switchers-Use-PlasmaCompone... of Package plasma5-addons

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Window-Desktop-Switchers-Use-PlasmaComponents.Label-.patch of Package plasma5-addons (Revision 5e513337c011bfc720d1707922bfca87)

Currently displaying revision 5e513337c011bfc720d1707922bfca87 , Show latest

From 5de20edc1a8e6419a6b8021ad907962c612dcf40 Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Mon, 14 Nov 2016 10:25:18 +0100
Subject: [PATCH 2/3] [Window/Desktop Switchers] Use PlasmaComponents.Label
 instead of Text

The former uses native text rendering which respects anti-aliasing and hinting settings.
It also automatically follows theme colors.
Unfortunately it breaks the font.bold binding, so using font.weight here instead.

BUG: 372218
FIXED-IN: 5.8.4

CHANGELOG: Font rendering in window/desktop switchers now follows anti-aliasing and hinting settings

Differential Revision: https://phabricator.kde.org/D3330
---
 desktopswitchers/previews/contents/ui/main.qml       |  8 +++-----
 windowswitchers/big_icons/contents/ui/main.qml       |  8 +++-----
 windowswitchers/compact/contents/ui/main.qml         |  6 +++---
 windowswitchers/informative/contents/ui/main.qml     | 10 ++++------
 windowswitchers/present_windows/contents/ui/main.qml |  6 +++---
 windowswitchers/small_icons/contents/ui/main.qml     |  8 +++-----
 windowswitchers/text/contents/ui/main.qml            |  4 ++--
 windowswitchers/thumbnails/contents/ui/main.qml      |  8 +++-----
 8 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/desktopswitchers/previews/contents/ui/main.qml b/desktopswitchers/previews/contents/ui/main.qml
index 6b709bd47..7eda333c3 100644
--- a/desktopswitchers/previews/contents/ui/main.qml
+++ b/desktopswitchers/previews/contents/ui/main.qml
@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.kquickcontrolsaddons 2.0
 import org.kde.kwin 2.0 as KWin
 
@@ -116,7 +117,7 @@ KWin.Switcher {
                     bottom: parent.bottom
                     topMargin: hoverItem.margins.bottom
                 }
-                Text {
+                PlasmaComponents.Label {
                     function constrainWidth() {
                         if (textItem.width > textItem.maxWidth && textItem.width > 0 && textItem.maxWidth > 0) {
                             textItem.width = textItem.maxWidth;
@@ -132,11 +133,8 @@ KWin.Switcher {
                     text: listView.currentItem ? listView.currentItem.caption : ""
                     horizontalAlignment: Text.AlignHCenter
                     verticalAlignment: Text.AlignVCenter
-                    color: theme.textColor
                     elide: Text.ElideMiddle
-                    font {
-                        bold: true
-                    }
+                    font.weight: Font.Bold
                     anchors {
                         verticalCenter: parent.verticalCenter
                         horizontalCenter: parent.horizontalCenter
diff --git a/windowswitchers/big_icons/contents/ui/main.qml b/windowswitchers/big_icons/contents/ui/main.qml
index 74cef21ae..4d9e156f0 100644
--- a/windowswitchers/big_icons/contents/ui/main.qml
+++ b/windowswitchers/big_icons/contents/ui/main.qml
@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.kquickcontrolsaddons 2.0
 import org.kde.kwin 2.0 as KWin
 
@@ -66,7 +67,7 @@ KWin.Switcher {
                     right: parent.right
                     bottom: parent.bottom
                 }
-                Text {
+                PlasmaComponents.Label {
                     function constrainWidth() {
                         if (textItem.width > textItem.maxWidth && textItem.width > 0 && textItem.maxWidth > 0) {
                             textItem.width = textItem.maxWidth;
@@ -82,11 +83,8 @@ KWin.Switcher {
                     text: icons.currentItem ? icons.currentItem.caption : ""
                     horizontalAlignment: Text.AlignHCenter
                     verticalAlignment: Text.AlignVCenter
-                    color: theme.textColor
                     elide: Text.ElideMiddle
-                    font {
-                        bold: true
-                    }
+                    font.weight: Font.Bold
                     anchors {
                         verticalCenter: parent.verticalCenter
                         horizontalCenter: parent.horizontalCenter
diff --git a/windowswitchers/compact/contents/ui/main.qml b/windowswitchers/compact/contents/ui/main.qml
index 23fe6c308..06653b246 100644
--- a/windowswitchers/compact/contents/ui/main.qml
+++ b/windowswitchers/compact/contents/ui/main.qml
@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.kquickcontrolsaddons 2.0
 import org.kde.kwin 2.0 as KWin
 
@@ -87,13 +88,12 @@ KWin.Switcher {
                             leftMargin: hoverItem.margins.left
                         }
                     }
-                    Text {
+                    PlasmaComponents.Label {
                         id: captionItem
                         horizontalAlignment: Text.AlignLeft
                         verticalAlignment: Text.AlignBottom
                         text: dialogMainItem.itemCaption(caption, minimized)
-                        font.bold: index == compactListView.currentIndex
-                        color: theme.textColor
+                        font.weight: index === compactListView.currentIndex ? Font.Bold : Font.Normal
                         elide: Text.ElideMiddle
                         anchors {
                             left: iconItem.right
diff --git a/windowswitchers/informative/contents/ui/main.qml b/windowswitchers/informative/contents/ui/main.qml
index 178077696..3bef87255 100644
--- a/windowswitchers/informative/contents/ui/main.qml
+++ b/windowswitchers/informative/contents/ui/main.qml
@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.kquickcontrolsaddons 2.0
 import org.kde.kwin 2.0 as KWin
 
@@ -74,13 +75,12 @@ KWin.Switcher {
                             leftMargin: hoverItem.margins.left
                         }
                     }
-                    Text {
+                    PlasmaComponents.Label {
                         id: captionItem
                         horizontalAlignment: Text.AlignHCenter
                         text: listView.itemCaption(caption, minimized)
-                        font.bold: true
+                        font.weight: Font.Bold
                         font.italic: minimized
-                        color: theme.textColor
                         elide: Text.ElideMiddle
                         anchors {
                             left: iconItem.right
@@ -90,13 +90,11 @@ KWin.Switcher {
                             rightMargin: hoverItem.margins.right
                         }
                     }
-                    Text {
+                    PlasmaComponents.Label {
                         id: desktopNameItem
                         horizontalAlignment: Text.AlignHCenter
                         text: desktopName
-                        font.bold: false
                         font.italic: true
-                        color: theme.textColor
                         elide: Text.ElideMiddle
                         visible: tabBox.allDesktops
                         anchors {
diff --git a/windowswitchers/present_windows/contents/ui/main.qml b/windowswitchers/present_windows/contents/ui/main.qml
index 067356c3d..6a0819bf0 100644
--- a/windowswitchers/present_windows/contents/ui/main.qml
+++ b/windowswitchers/present_windows/contents/ui/main.qml
@@ -20,6 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import QtQuick 2.0
 import QtQuick.Layouts 1.1
 import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.kquickcontrolsaddons 2.0
 import org.kde.kwin 2.0 as KWin
 
@@ -105,11 +106,10 @@ KWin.Switcher {
                             Layout.preferredWidth: iconSize
                             Layout.preferredHeight: iconSize
                         }
-                        Text {
+                        PlasmaComponents.Label {
                             text: caption
                             font.italic: minimized
-                            font.bold: index == thumbnailListView.currentIndex
-                            color: theme.textColor
+                            font.weight: index === thumbnailListView.currentIndex ? Font.Bold : Font.Normal
                             elide: Text.ElideMiddle
                             Layout.fillWidth: true
                             Layout.maximumWidth: captionItem.maximumWidth - iconItem.iconSize - captionItem.spacing * 2
diff --git a/windowswitchers/small_icons/contents/ui/main.qml b/windowswitchers/small_icons/contents/ui/main.qml
index ec4a4d769..2238a77b5 100644
--- a/windowswitchers/small_icons/contents/ui/main.qml
+++ b/windowswitchers/small_icons/contents/ui/main.qml
@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.kquickcontrolsaddons 2.0
 import org.kde.kwin 2.0 as KWin
 
@@ -65,17 +66,14 @@ KWin.Switcher {
                     right: parent.right
                     bottom: parent.bottom
                 }
-                Text {
+                PlasmaComponents.Label {
                     id: textItem
                     text: icons.currentItem ? icons.currentItem.caption : ""
                     height: paintedHeight
                     horizontalAlignment: Text.AlignHCenter
                     verticalAlignment: Text.AlignVCenter
-                    color: theme.textColor
                     elide: Text.ElideMiddle
-                    font {
-                        bold: true
-                    }
+                    font.weight: Font.Bold
                     anchors {
                         right: parent.right
                         left: parent.left
diff --git a/windowswitchers/text/contents/ui/main.qml b/windowswitchers/text/contents/ui/main.qml
index 5af797e81..91c954905 100644
--- a/windowswitchers/text/contents/ui/main.qml
+++ b/windowswitchers/text/contents/ui/main.qml
@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.kquickcontrolsaddons 2.0
 import org.kde.kwin 2.0 as KWin
 
@@ -61,11 +62,10 @@ KWin.Switcher {
                     id: delegateItem
                     width: textListView.width
                     height: textListView.rowHeight
-                    Text {
+                    PlasmaComponents.Label {
                         id: captionItem
                         horizontalAlignment: Text.AlignHCenter
                         text: caption
-                        color: theme.textColor
                         elide: Text.ElideMiddle
                         anchors {
                             left: parent.left
diff --git a/windowswitchers/thumbnails/contents/ui/main.qml b/windowswitchers/thumbnails/contents/ui/main.qml
index a005c386d..eca7f417d 100644
--- a/windowswitchers/thumbnails/contents/ui/main.qml
+++ b/windowswitchers/thumbnails/contents/ui/main.qml
@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.kquickcontrolsaddons 2.0
 import org.kde.kwin 2.0 as KWin
 
@@ -133,7 +134,7 @@ KWin.Switcher {
                         rightMargin: 4
                     }
                 }
-                Text {
+                PlasmaComponents.Label {
                     function constrainWidth() {
                         if (textItem.width > textItem.maxWidth && textItem.width > 0 && textItem.maxWidth > 0) {
                             textItem.width = textItem.maxWidth;
@@ -149,11 +150,8 @@ KWin.Switcher {
                     text: thumbnailListView.currentItem ? thumbnailListView.currentItem.caption : ""
                     horizontalAlignment: Text.AlignHCenter
                     verticalAlignment: Text.AlignVCenter
-                    color: theme.textColor
                     elide: Text.ElideMiddle
-                    font {
-                        bold: true
-                    }
+                    font.weight: Font.Bold
                     anchors {
                         verticalCenter: parent.verticalCenter
                         horizontalCenter: parent.horizontalCenter
-- 
2.11.0

Places

File 0002-Window-Desktop-Switchers-Use-PlasmaComponents.Label-.patch of Package plasma5-addons (Revision 5e513337c011bfc720d1707922bfca87)

Places