[kwin/tabbox] Adjust Compact to API change

tabbox/qml/clients/compact/contents/ui/main.qml

@@ -20,36 +20,36 @@ 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.qtextracomponents 2.0
+import org.kde.kwin 2.0 as KWin
 
-Item {
+KWin.Switcher {
-    id: compactTabBox
+    id: tabBox
-    property int screenWidth : 0
+    currentIndex: compactListView.currentIndex
-    property int screenHeight : 0
+
-    property string longestCaption: ""
+    PlasmaCore.Dialog {
+        id: dialog
+        location: PlasmaCore.Types.Floating
+        visible: tabBox.visible
+        windowFlags: Qt.X11BypassWindowManagerHint
+        onVisibleChanged: {
+            if (visible) {
+                dialog.x = tabBox.screenGeometry.x + tabBox.screenGeometry.width * 0.5 - dialogMainItem.width * 0.5;
+                dialog.y = tabBox.screenGeometry.y + tabBox.screenGeometry.height * 0.5 - dialogMainItem.height * 0.5;
+            }
+        }
+
+        mainItem: Item {
+            id: dialogMainItem
             property int optimalWidth: compactListView.maxRowWidth
-    property int optimalHeight: compactListView.rowHeight * compactListView.count + background.topMargin + background.bottomMargin
+            property int optimalHeight: compactListView.rowHeight * compactListView.count
             property bool canStretchX: true
             property bool canStretchY: false
-    property string maskImagePath: background.maskImagePath
+            width: Math.min(Math.max(tabBox.screenGeometry.width * 0.2, optimalWidth), tabBox.screenGeometry.width * 0.8)
-    property double maskWidth: background.centerWidth
+            height: Math.min(Math.max(tabBox.screenGeometry.height * 0.2, optimalHeight), tabBox.screenGeometry.height * 0.8)
-    property double maskHeight: background.centerHeight
-    property int maskTopMargin: background.centerTopMargin
-    property int maskLeftMargin: background.centerLeftMargin
-    width: Math.min(Math.max(screenWidth * 0.2, optimalWidth), screenWidth * 0.8)
-    height: Math.min(Math.max(screenHeight * 0.2, optimalHeight), screenHeight * 0.8)
             focus: true
 
             property int textMargin: 2
 
-    onLongestCaptionChanged: {
-        compactListView.maxRowWidth = compactListView.calculateMaxRowWidth();
-    }
-
-    function setModel(model) {
-        compactListView.model = model;
-        compactListView.maxRowWidth = compactListView.calculateMaxRowWidth();
-    }
-
             /**
             * Returns the caption with adjustments for minimized items.
             * @param caption the original caption
@@ -72,11 +72,6 @@ Item {
                 visible: false
             }
 
-    ShadowedSvgItem {
-        id: background
-        anchors.fill: parent
-    }
-
             // delegate
             Component {
                 id: listDelegate
@@ -100,7 +95,7 @@ Item {
                         id: captionItem
                         horizontalAlignment: Text.AlignLeft
                         verticalAlignment: Text.AlignBottom
-                text: itemCaption(caption, minimized)
+                        text: dialogMainItem.itemCaption(caption, minimized)
                         font.bold: index == compactListView.currentIndex
                         color: theme.textColor
                         elide: Text.ElideMiddle
@@ -112,14 +107,13 @@ Item {
                             topMargin: hoverItem.margins.top
                             rightMargin: hoverItem.margins.right
                             bottomMargin: hoverItem.margins.bottom
-                    leftMargin: 2 * compactTabBox.textMargin
+                            leftMargin: 2 * dialogMainItem.textMargin
                         }
                     }
                     MouseArea {
                         anchors.fill: parent
                         onClicked: {
                             compactListView.currentIndex = index;
-                    compactListView.currentIndexChanged(compactListView.currentIndex);
                         }
                     }
                 }
@@ -130,14 +124,14 @@ Item {
                     var textElement = Qt.createQmlObject(
                         'import QtQuick 2.0;'
                         + 'Text {\n'
-                + '     text: "' + itemCaption(compactTabBox.longestCaption, true) + '"\n'
+                        + '     text: "' + dialogMainItem.itemCaption(tabBox.model.longestCaption(), true) + '"\n'
                         + '     font.bold: true\n'
                         + '     visible: false\n'
                         + '}',
                         compactListView, "calculateMaxRowWidth");
                     width = Math.max(textElement.width, width);
                     textElement.destroy();
-            return width + 16 + 2 * compactTabBox.textMargin + hoverItem.margins.right + hoverItem.margins.left + background.leftMargin + background.rightMargin
+                    return width + 16 + 2 * dialogMainItem.textMargin + hoverItem.margins.right + hoverItem.margins.left
                 }
                 /**
                 * Calculates the height of one row based on the text height and icon size.
@@ -157,19 +151,14 @@ Item {
                     // icon size or two text elements and margins and hoverItem margins
                     return Math.max(16, height + hoverItem.margins.top + hoverItem.margins.bottom);
                 }
-        signal currentIndexChanged(int index)
                 id: compactListView
-        objectName: "listView"
+                // the maximum text width + icon item width (32 + 4 margin) + margins for hover item
-        // the maximum text width + icon item width (32 + 4 margin) + margins for hover item + margins for background
                 property int maxRowWidth: calculateMaxRowWidth()
                 property int rowHeight: calcRowHeight()
                 anchors {
                     fill: parent
-            topMargin: background.topMargin
-            leftMargin: background.leftMargin
-            rightMargin: background.rightMargin
-            bottomMargin: background.bottomMargin
                 }
+                model: tabBox.model
                 clip: true
                 delegate: listDelegate
                 highlight: PlasmaCore.FrameSvgItem {
@@ -180,6 +169,10 @@ Item {
                 }
                 highlightMoveDuration: 250
                 boundsBehavior: Flickable.StopAtBounds
+                Connections {
+                    target: tabBox
+                    onCurrentIndexChanged: {compactListView.currentIndex = tabBox.currentIndex;}
+                }
             }
             /*
             * Key navigation on outer item for two reasons:
@@ -189,10 +182,10 @@ Item {
             Keys.onPressed: {
                 if (event.key == Qt.Key_Up) {
                     compactListView.decrementCurrentIndex();
-            compactListView.currentIndexChanged(compactListView.currentIndex);
                 } else if (event.key == Qt.Key_Down) {
                     compactListView.incrementCurrentIndex();
-            compactListView.currentIndexChanged(compactListView.currentIndex);
+                }
+            }
         }
     }
 }