Merge lp:~saviq/unity-2d/shell_revert-resizable-launcher into lp:~unity-2d-team/unity-2d/unity-2d-shell-shaped

[Michał Sawicz]

[shell] revert resizable launcher
The resizable launcher code needs to be revisited at a later time.

=== modified file 'data/com.canonical.Unity2d.gschema.xml'
--- data/com.canonical.Unity2d.gschema.xml	2011-12-14 13:36:26 +0000
+++ data/com.canonical.Unity2d.gschema.xml	2012-01-16 18:02:25 +0000
@@ -24,11 +24,6 @@
         2: intellihide; same as auto hide but the launcher will disappear if a window is placed on top of it
        </description>
     </key>
-    <key name="thickness" type="i">
-      <default>66</default>
-      <summary>Thickness of the launcher</summary>
-      <description>Size of the small side (typically the horizontal side) of the launcher</description>
-    </key>
   </schema>
   <schema path="/com/canonical/unity-2d/panel/" id="com.canonical.Unity2d.Panel" gettext-domain="unity-2d">
     <key type="as" name="applets">
 
=== modified file 'libunity-2d-private/src/launcherclient.cpp'
--- libunity-2d-private/src/launcherclient.cpp	2012-01-10 10:42:46 +0000
+++ libunity-2d-private/src/launcherclient.cpp	2012-01-16 18:02:25 +0000
@@ -21,4 +21,6 @@
 // Self
 #include "launcherclient.h"
 
+const int LauncherClient::MaximumWidth = 65;
+
 #include "launcherclient.moc"
 
=== modified file 'libunity-2d-private/src/launcherclient.h'
--- libunity-2d-private/src/launcherclient.h	2011-12-14 13:45:43 +0000
+++ libunity-2d-private/src/launcherclient.h	2012-01-16 18:02:25 +0000
@@ -32,6 +32,7 @@
 class LauncherClient
 {
 public:
+    static const int MaximumWidth;
 };
 
 #endif /* LAUNCHERCLIENT_H */
 
=== modified file 'libunity-2d-private/src/screeninfo.cpp'
--- libunity-2d-private/src/screeninfo.cpp	2012-01-09 18:08:01 +0000
+++ libunity-2d-private/src/screeninfo.cpp	2012-01-16 18:02:25 +0000
@@ -14,7 +14,6 @@
 #include <QX11Info>
 #include <QApplication>
 #include <QDesktopWidget>
-#include <QVariant>
 
 ScreenInfo::ScreenInfo(QObject *parent) :
     QObject(parent),
@@ -30,8 +29,6 @@
                                      SLOT(updateGeometry(int)));
     connect(QApplication::desktop(), SIGNAL(workAreaResized(int)),
                                      SLOT(updateAvailableGeometry(int)));
-    connect(&launcher2dConfiguration(), SIGNAL(thicknessChanged(int)),
-                                        SLOT(onLauncherThicknessChanged()));
 }
 
 
@@ -79,11 +76,10 @@
     QRect screenRect = QApplication::desktop()->screenGeometry(screen);
     QRect availableRect = QApplication::desktop()->availableGeometry(screen);
 
-    int launcherThickness = launcher2dConfiguration().property("thickness").toInt();
     QRect availableGeometry(
-        launcherThickness,
+        LauncherClient::MaximumWidth,
         availableRect.top(),
-        screenRect.width() - launcherThickness,
+        screenRect.width() - LauncherClient::MaximumWidth,
         availableRect.height()
         );
     if (QApplication::isRightToLeft()) {
@@ -112,11 +108,6 @@
     }
 }
 
-void ScreenInfo::onLauncherThicknessChanged()
-{
-    Q_EMIT panelsFreeGeometryChanged(panelsFreeGeometry());
-}
-
 bool ScreenInfo::isCompositingManagerRunning() const
 {
     return QX11Info::isCompositingManagerRunning();
 
=== modified file 'libunity-2d-private/src/screeninfo.h'
--- libunity-2d-private/src/screeninfo.h	2012-01-09 18:08:01 +0000
+++ libunity-2d-private/src/screeninfo.h	2012-01-16 18:02:25 +0000
@@ -54,7 +54,6 @@
 private Q_SLOTS:
     void updateGeometry(int screen);
     void updateAvailableGeometry(int screen);
-    void onLauncherThicknessChanged();
 
 private:
     WorkspacesInfo m_workspacesInfo;
 
=== modified file 'libunity-2d-private/src/unity2dpanel.cpp'
--- libunity-2d-private/src/unity2dpanel.cpp	2011-12-14 13:34:52 +0000
+++ libunity-2d-private/src/unity2dpanel.cpp	2012-01-16 18:02:25 +0000
@@ -49,7 +49,6 @@
     bool m_useStrut;
     int m_delta;
     bool m_manualSliding;
-    int m_thickness;
 
     void setStrut(ulong* struts)
     {
@@ -105,15 +104,15 @@
         switch (m_edge) {
         case Unity2dPanel::LeftEdge:
             if (QApplication::isLeftToRight()) {
-                rect = QRect(screen.left(), available.top(), m_thickness, available.height());
+                rect = QRect(screen.left(), available.top(), q->width(), available.height());
                 rect.moveLeft(m_delta);
             } else {
-                rect = QRect(screen.right() - m_thickness, available.top(), m_thickness, available.height());
+                rect = QRect(screen.right() - q->width(), available.top(), q->width(), available.height());
                 rect.moveRight(screen.right() - m_delta);
             }
             break;
         case Unity2dPanel::TopEdge:
-            rect = QRect(screen.left(), screen.top(), screen.width(), m_thickness);
+            rect = QRect(screen.left(), screen.top(), screen.width(), q->height());
             rect.moveTop(m_delta);
             break;
         }
@@ -158,7 +157,6 @@
     d->m_layout = new QHBoxLayout(this);
     d->m_layout->setMargin(0);
     d->m_layout->setSpacing(0);
-    d->m_thickness = 0;
 
     d->m_slideInAnimation = new QPropertyAnimation(this);
     d->m_slideInAnimation->setTargetObject(this);
@@ -170,7 +168,7 @@
     d->m_slideOutAnimation->setTargetObject(this);
     d->m_slideOutAnimation->setPropertyName("delta");
     d->m_slideOutAnimation->setDuration(SLIDE_DURATION);
-    d->m_slideOutAnimation->setEndValue(-thickness());
+    d->m_slideOutAnimation->setEndValue(-panelSize());
 
     setAttribute(Qt::WA_X11NetWmWindowTypeDock);
     setAttribute(Qt::WA_Hover);
@@ -219,13 +217,13 @@
 {
     QWidget::showEvent(event);
     d->updateEdge();
-    d->m_slideOutAnimation->setEndValue(-thickness());
+    d->m_slideOutAnimation->setEndValue(-panelSize());
 }
 
 void Unity2dPanel::resizeEvent(QResizeEvent* event)
 {
     QWidget::resizeEvent(event);
-    d->m_slideOutAnimation->setEndValue(-thickness());
+    d->m_slideOutAnimation->setEndValue(-panelSize());
 }
 
 void Unity2dPanel::slotWorkAreaResized(int screen)
@@ -279,34 +277,18 @@
 void Unity2dPanel::setDelta(int delta)
 {
     /* Clamp delta to be between 0 and minus its size */
-    int minDelta = -thickness();
+    int minDelta = -panelSize();
     int maxDelta = 0;
 
     d->m_delta = qMax(qMin(delta, maxDelta), minDelta);
     d->updateGeometry();
 }
 
-int Unity2dPanel::thickness() const
+int Unity2dPanel::panelSize() const
 {
     return (d->m_edge == Unity2dPanel::TopEdge) ? height() : width();
 }
 
-void Unity2dPanel::setThickness(int thickness)
-{
-    if (thickness == d->m_thickness) {
-        return;
-    }
-
-    d->m_thickness = thickness;
-
-    /* Update variables that depend on thickness' value */
-    setDelta(d->m_delta);
-    d->m_slideOutAnimation->setEndValue(-thickness);
-    d->updateGeometry();
-
-    Q_EMIT thicknessChanged(thickness);
-}
-
 void Unity2dPanel::slideIn()
 {
     d->m_slideOutAnimation->stop();
 
=== modified file 'libunity-2d-private/src/unity2dpanel.h'
--- libunity-2d-private/src/unity2dpanel.h	2011-12-14 13:34:52 +0000
+++ libunity-2d-private/src/unity2dpanel.h	2012-01-16 18:02:25 +0000
@@ -45,7 +45,6 @@
      */
     Q_PROPERTY(int manualSliding READ manualSliding WRITE setManualSliding NOTIFY manualSlidingChanged)
     Q_PROPERTY(bool useStrut READ useStrut WRITE setUseStrut NOTIFY useStrutChanged)
-    Q_PROPERTY(int thickness READ thickness WRITE setThickness NOTIFY thicknessChanged)
 
 public:
     enum Edge {
@@ -77,8 +76,7 @@
     int delta() const;
     void setDelta(int);
 
-    int thickness() const;
-    void setThickness(int);
+    int panelSize() const;
 
     bool manualSliding() const;
     void setManualSliding(bool);
@@ -92,7 +90,6 @@
 Q_SIGNALS:
     void manualSlidingChanged(bool);
     void useStrutChanged(bool);
-    void thicknessChanged(int);
 
 protected:
     virtual void showEvent(QShowEvent*);
 
=== modified file 'panel/app/panelmanager.cpp'
--- panel/app/panelmanager.cpp	2011-12-14 13:34:52 +0000
+++ panel/app/panelmanager.cpp	2012-01-16 18:02:25 +0000
@@ -141,7 +141,7 @@
     Unity2dPanel* panel = new Unity2dPanel;
     panel->setAccessibleName("Top Panel");
     panel->setEdge(Unity2dPanel::TopEdge);
-    panel->setThickness(24);
+    panel->setFixedHeight(24);
 
     QPoint p;
     if (QApplication::isRightToLeft()) {
 
=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2011-12-14 13:36:26 +0000
+++ panel/applets/appname/appnameapplet.cpp	2012-01-16 18:02:25 +0000
@@ -55,7 +55,6 @@
 #include <QPoint>
 
 static const int APPNAME_LABEL_LEFT_MARGIN = 6;
-static const int APPNAME_WINDOW_BUTTONS_WIDTH = 66;
 
 class WindowButton : public QAbstractButton
 {
@@ -183,7 +182,7 @@
         layout->addWidget(m_closeButton);
         layout->addWidget(m_minimizeButton);
         layout->addWidget(m_maximizeButton);
-        m_windowButtonWidget->setFixedWidth(APPNAME_WINDOW_BUTTONS_WIDTH);
+        m_windowButtonWidget->setFixedWidth(LauncherClient::MaximumWidth);
         QObject::connect(m_closeButton, SIGNAL(clicked()), m_windowHelper, SLOT(close()));
         QObject::connect(m_minimizeButton, SIGNAL(clicked()), m_windowHelper, SLOT(minimize()));
         QObject::connect(m_maximizeButton, SIGNAL(clicked()), m_windowHelper, SLOT(toggleMaximize()));
@@ -301,7 +300,7 @@
 
         // Define label width
         if (!isMaximized && showMenu) {
-            d->m_label->setMaximumWidth(APPNAME_WINDOW_BUTTONS_WIDTH);
+            d->m_label->setMaximumWidth(LauncherClient::MaximumWidth);
         } else {
             d->m_label->setMaximumWidth(QWIDGETSIZE_MAX);
         }
 
=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-01-13 11:58:28 +0000
+++ shell/Shell.qml	2012-01-16 18:02:25 +0000
@@ -31,7 +31,7 @@
         id: launcherLoader
         anchors.top: parent.top
         anchors.bottom: parent.bottom
-        width: launcher2dConfiguration.thickness
+        width: 65
         x: visibilityController.shown ? 0 : -width
 
         KeyNavigation.right: dashLoader
 
=== modified file 'shell/launcher/Launcher.qml'
--- shell/launcher/Launcher.qml	2012-01-10 16:41:53 +0000
+++ shell/launcher/Launcher.qml	2012-01-16 18:02:25 +0000
@@ -117,9 +117,10 @@
             }
 
             anchors.top: parent.top
-            anchors.bottom: shelf.top
+            anchors.bottomMargin: 0
             /* the distance from the top of the launcher and the dash tile is 6 instead of 7 */
             anchors.topMargin: -1
+            height: parent.height - shelf.height + ((selectionOutlineSize - tileSize)) - 4
             width: parent.width
 
             /* Ensure all delegates are cached in order to improve smoothness of
@@ -163,7 +164,8 @@
             objectName: "shelf"
 
             anchors.bottom: parent.bottom
-            anchors.bottomMargin: main.anchors.topMargin
+            anchors.bottomMargin: main.anchors.bottomMargin
+            anchors.topMargin: main.anchors.topMargin
             height: selectionOutlineSize * count
             width: parent.width
             interactive: false
 
=== modified file 'shell/launcher/LauncherItem.qml'
--- shell/launcher/LauncherItem.qml	2012-01-10 17:14:44 +0000
+++ shell/launcher/LauncherItem.qml	2012-01-16 18:02:25 +0000
@@ -52,8 +52,11 @@
 
     anchors.horizontalCenter: parent.horizontalCenter
 
+    height: selectionOutlineSize
+
     property bool isBfb: false
     property int tileSize
+    property int selectionOutlineSize
     property alias name: looseItem.objectName
     property string desktopFile: ""
     property alias icon: icon.source
@@ -132,13 +135,8 @@
            the active one */
         Image {
             objectName: "active"
-
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
             anchors.right: parent.right
-
-            width: parent.width * 0.15
-            fillMode: Image.PreserveAspectFit
+            y: item.height - item.selectionOutlineSize / 2 - height / 2
             mirror: isRightToLeft()
 
             source: "image://blended/%1color=%2alpha=%3"
@@ -164,9 +162,7 @@
                    printed for the following two anchor assignements. This fixes the
                    problem, but I'm not sure if it should happen in the first place. */
                 anchors.left: (parent) ? parent.left : undefined
-                width: parent.width * 0.15
-                height: width * sourceSize.height / sourceSize.width
-                y: (item.height - height) / 2 + getPipOffset(index) * 0.015 * item.height
+                y: item.height - item.selectionOutlineSize / 2 - height / 2 + getPipOffset(index)
                 mirror: isRightToLeft()
 
                 source: "image://blended/%1color=%2alpha=%3"
@@ -216,6 +212,8 @@
                     running: launching
                 }
 
+                sourceSize.width: item.tileSize
+                sourceSize.height: item.tileSize
                 source: {
                     if (isBfb) {
                         if (declarativeView.focus && item.activeFocus) {
@@ -240,6 +238,8 @@
                 anchors.fill: parent
                 smooth: true
 
+                sourceSize.width: item.tileSize
+                sourceSize.height: item.tileSize
                 source: "artwork/round_outline_54x54.png"
 
                 opacity: 0
@@ -258,13 +258,11 @@
             Image {
                 id: icon
                 objectName: "icon"
-
-                anchors.fill: parent
-                anchors.margins: parent.width * 0.056
+                anchors.centerIn: parent
                 smooth: true
 
-                sourceSize.width: Math.max(width, 16)
-                sourceSize.height: Math.max(height, 16)
+                sourceSize.width: 48
+                sourceSize.height: 48
 
                 /* Whenever one of the parameters used in calculating the background color of
                    the icon changes, recalculate its value */
@@ -288,14 +286,14 @@
                 smooth: true
 
                 source: isBfb ? "artwork/squircle_shine_54.png" : "artwork/round_shine_54x54.png"
+                sourceSize.width: item.tileSize
+                sourceSize.height: item.tileSize
             }
 
             Image {
                 id: selectionOutline
                 objectName: "selectionOutline"
                 anchors.centerIn: parent
-                width: item.width
-                height: item.height
                 smooth: true
                 source: isBfb ? "artwork/squircle_glow_54.png" : "artwork/round_selected_66x66.png"
                 visible: declarativeView.focus && item.activeFocus
@@ -303,22 +301,22 @@
 
             Rectangle {
                 id: counter
-                height: width / 2 - border.width
-                width: parent.width * 0.59
+                height: 16 - border.width
+                width: 32
                 // Using anchors the item will be 1 pixel off with respect to Unity
                 y: 1
                 x: 1
                 radius: height / 2 - 1
                 smooth: true
-                border.width: width / 16
+                border.width: 2
                 border.color: "white"
                 color: "#595959"
                 visible: launcherItem.counterVisible
 
                 Text {
                     anchors.centerIn: parent
-                    font.pixelSize: parent.height * 0.79
-                    width: parent.width * 0.84
+                    font.pixelSize: parent.height - 3
+                    width: parent.width - 5
                     smooth: true
                     elide: Text.ElideRight
                     horizontalAlignment: Text.AlignHCenter
@@ -331,8 +329,7 @@
                 id: progressBar
                 objectName: "progressBar"
                 source: "artwork/progress_bar_trough.png"
-                anchors.top: parent.top
-                anchors.bottom: parent.bottom
+                anchors.verticalCenter: parent.verticalCenter
                 anchors.left: parent.left
                 width: tile.width
                 smooth: true
@@ -341,10 +338,9 @@
                 Image {
                     id: progressFill
                     source: "artwork/progress_bar_fill.png"
-                    x: parent.width * 0.11
-                    y: (parent.height - height) / 2
-                    width: parent.width * 0.78 * launcherItem.progress
-                    height: parent.height * 0.074
+                    anchors.verticalCenter: parent.verticalCenter
+                    x: 6
+                    width: sourceSize.width * launcherItem.progress
                     smooth: true
 
                     Behavior on width {
@@ -377,8 +373,8 @@
                 anchors.centerIn: parent
                 color: "#B3000000" // 0.7 opacity on black
                 radius: 2
-                width: parent.width * 0.41
-                height: parent.height * 0.41
+                width: 22
+                height: 22
                 smooth: true
 
                 Text {
@@ -386,7 +382,6 @@
                     anchors.centerIn: parent
                     color: "white"
                     smooth: true
-                    font.pixelSize: parent.height * 0.7
                 }
             }
 
 
=== modified file 'shell/launcher/LauncherList.qml'
--- shell/launcher/LauncherList.qml	2012-01-10 17:14:44 +0000
+++ shell/launcher/LauncherList.qml	2012-01-16 18:02:25 +0000
@@ -25,13 +25,13 @@
 
     /* The spacing is explicitly set in order to compensate
        the space added by selectionOutline and round_corner_54x54.png. */
-    spacing: -width * 0.12 // FIXME: live update broken by this code
+    spacing: -8
 
-    property int tileSize: width * 0.82
+    property int tileSize: 54
 
     /* selectionOutline tile size, so AutoScrollingList view can calculate
        the right height. */
-    property int selectionOutlineSize: width // this is the size of an item; items are square
+    property int selectionOutlineSize:  65
 
     /* Keep a reference to the currently visible contextual menu */
     property variant visibleMenu
@@ -96,8 +96,8 @@
         name: item.name
 
         width: list.width
-        height: width
         tileSize: list.tileSize
+        selectionOutlineSize: list.selectionOutlineSize
 
         desktopFile: item.desktop_file ? item.desktop_file : ""
         icon: item.icon != "" ? "image://icons/" + item.icon : "image://icons/unknown"