From 5f412e8b751f7c0749ff12bb7348c64101b056f7 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Mon, 8 Jun 2015 19:17:10 -0700 Subject: [PATCH] close button --- applets/notifications/contents/ui/NotificationStripe.qml | 2 +- kwinmultitasking/contents/ui/panel.qml | 6 ++++++ kwinmultitasking/metadata.desktop | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/applets/notifications/contents/ui/NotificationStripe.qml b/applets/notifications/contents/ui/NotificationStripe.qml index f5719b73..5d9356aa 100644 --- a/applets/notifications/contents/ui/NotificationStripe.qml +++ b/applets/notifications/contents/ui/NotificationStripe.qml @@ -122,7 +122,7 @@ MouseArea { } horizontalAlignment: Qt.AlignRight verticalAlignment: Qt.AlignVCenter - text: summary + (!notificationItem.expanded && body ? "..." : "") + text: background.margins.top + summary + (!notificationItem.expanded && body ? "..." : "") wrapMode: Text.WordWrap } PlasmaComponents.Label { diff --git a/kwinmultitasking/contents/ui/panel.qml b/kwinmultitasking/contents/ui/panel.qml index 9b019def..0cc21766 100644 --- a/kwinmultitasking/contents/ui/panel.qml +++ b/kwinmultitasking/contents/ui/panel.qml @@ -42,6 +42,12 @@ PlasmaCore.Dialog { iconSource: "go-home" onClicked: root.closeWindowList(); } + + PlasmaComponents.ToolButton { + anchors.right: parent.right + iconSource: "window-close" + onClicked: workspace.activeClient.closeWindow(); + } } Component.onCompleted: { KWin.registerWindow(panel); diff --git a/kwinmultitasking/metadata.desktop b/kwinmultitasking/metadata.desktop index 274c348e..40aef470 100644 --- a/kwinmultitasking/metadata.desktop +++ b/kwinmultitasking/metadata.desktop @@ -12,6 +12,7 @@ X-KDE-PluginInfo-Author=Marco Martin X-KDE-PluginInfo-Email=mart@kde.org X-KDE-PluginInfo-Name=org.kde.phone.multitasking X-KDE-PluginInfo-Version=1.0 +X-KDE-PluginInfo-EnabledByDefault=true X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-License=GPL