Merge lp:~mardy/unity-2d/geometry into lp:unity-2d

[Alberto Mardegan]

Better handling of screen geometry

Revert change introduced in revision 752 where the semantics of ScreenInfo::availableGeometry() where changed.
Now that method will return the same as QDesktopWidget::availableGeometry() returns; instead, a new method ScreenInfo::panelsFreeGeometry() will return the available geometry minus the launcher.

Also, a the screenGeometry and availableGeometry properties were removed from the DashDeclarative class, because they were unused (and ScreenInfo provides the same information).

[Florian Boucault (fboucault)]

If you could also remove the various instantiation of ScreenInfo and replace them with using ScreenInfo::instance() that'd be perfect.

review: Needs Fixing

[Florian Boucault (fboucault)]

I believe the two instances of this are:

DashDeclarativeView.m_screenInfo
SpreadView.m_screenInfo

[Florian Boucault (fboucault)]

Is there a bug report for the background jumping issue we could link to?

[lp:~mardy/unity-2d/geometry]

770. By Alberto Mardegan on 2011-10-24

Remove storing of ScreenInfo instance in object private data

[Lohith D Shivamurthy (dyams)]

Would like to suggest the following:

1) Change the name of the following methods:

     • Current name : DashDeclarativeView::fitToAvailableSpace
       New Name : DashDeclarativeView::resizeToFullscreenMode()

     • Current name : DashDeclarativeView::resizeToDesktopModeSize()
       New name : DashDeclarativeView::resizeToDesktopMode()

2) Similar to ScreenInfo, Could we also make 'LauncherClicent' a singleton? It has three instances now.

[Alberto Mardegan (mardy)]

Lohith, this merge request has been superseded by https://code.launchpad.net/~mardy/unity-2d/geometry/+merge/80071

[Lohith D Shivamurthy (dyams)]

This branch is moved to new location.
Please follow the new branch here
https://code.launchpad.net/~dyams/unity-2d/mardy-geometry/+merge/83767

Thank you

Unmerged revisions

=== modified file 'libunity-2d-private/src/screeninfo.cpp'
--- libunity-2d-private/src/screeninfo.cpp	2011-10-03 11:13:44 +0000
+++ libunity-2d-private/src/screeninfo.cpp	2011-10-21 11:42:24 +0000
@@ -71,6 +71,12 @@
 
 QRect ScreenInfo::availableGeometry() const
 {
+    int screen = QX11Info::appScreen();
+    return QApplication::desktop()->availableGeometry(screen);
+}
+
+QRect ScreenInfo::panelsFreeGeometry() const
+{
     /* We cannot just return the system's availableGeometry(), because that
      * doesn't consider the Launcher, if it's set to auto-hide. */
     int screen = QX11Info::appScreen();
@@ -105,6 +111,7 @@
 {
     if (screen == QX11Info::appScreen()) {
         Q_EMIT availableGeometryChanged(availableGeometry());
+        Q_EMIT panelsFreeGeometryChanged(panelsFreeGeometry());
     }
 }
 

=== modified file 'libunity-2d-private/src/screeninfo.h'
--- libunity-2d-private/src/screeninfo.h	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/screeninfo.h	2011-10-21 11:42:24 +0000
@@ -21,6 +21,7 @@
     Q_PROPERTY(unsigned int activeWindow READ activeWindow NOTIFY activeWindowChanged)
     Q_PROPERTY(QRect geometry READ geometry NOTIFY geometryChanged)
     Q_PROPERTY(QRect availableGeometry READ availableGeometry NOTIFY availableGeometryChanged)
+    Q_PROPERTY(QRect panelsFreeGeometry READ panelsFreeGeometry NOTIFY panelsFreeGeometryChanged)
     Q_PROPERTY(bool isCompositingManagerRunning READ isCompositingManagerRunning
                                                 NOTIFY isCompositingManagerRunningChanged)
 
@@ -36,6 +37,7 @@
     WorkspacesInfo *workspaces() { return &m_workspacesInfo; }
     unsigned int activeWindow() const { return m_activeWindow; }
     QRect availableGeometry() const;
+    QRect panelsFreeGeometry() const;
     QRect geometry() const;
     bool isCompositingManagerRunning() const;
 
@@ -43,6 +45,7 @@
     void activeWindowChanged(unsigned int activeWindow);
     void geometryChanged(QRect geometry);
     void availableGeometryChanged(QRect availableGeometry);
+    void panelsFreeGeometryChanged(QRect panelsFreeGeometry);
     void workspacesChanged(WorkspacesInfo *workspaces);
     void isCompositingManagerRunningChanged(bool);
 

=== modified file 'places/app/dashdeclarativeview.cpp'
--- places/app/dashdeclarativeview.cpp	2011-10-03 11:13:44 +0000
+++ places/app/dashdeclarativeview.cpp	2011-10-21 11:42:24 +0000
@@ -59,7 +59,6 @@
     setTransparentBackground(QX11Info::isCompositingManagerRunning());
 
     QDesktopWidget* desktop = QApplication::desktop();
-    connect(desktop, SIGNAL(resized(int)), SIGNAL(screenGeometryChanged()));
     connect(desktop, SIGNAL(resized(int)), SIGNAL(updateDashModeDependingOnScreenGeometry()));
     connect(desktop, SIGNAL(workAreaResized(int)), SLOT(onWorkAreaResized(int)));
 
@@ -74,7 +73,6 @@
     }
 
     updateSize();
-    availableGeometryChanged();
 }
 
 
@@ -112,7 +110,7 @@
 void
 DashDeclarativeView::fitToAvailableSpace()
 {
-    QRect rect = availableGeometry();
+    QRect rect = m_screenInfo->panelsFreeGeometry();
     move(rect.topLeft());
     setFixedSize(rect.size());
 }
@@ -120,7 +118,7 @@
 void
 DashDeclarativeView::resizeToDesktopModeSize()
 {
-    QRect rect = availableGeometry();
+    QRect rect = m_screenInfo->panelsFreeGeometry();
     int screenRight = rect.right();
 
     rect.setWidth(qMin(DASH_DESKTOP_WIDTH, rect.width()));
@@ -261,19 +259,6 @@
     setActive(true);
 }
 
-const QRect
-DashDeclarativeView::screenGeometry() const
-{
-    QDesktopWidget* desktop = QApplication::desktop();
-    return desktop->screenGeometry(this);
-}
-
-QRect
-DashDeclarativeView::availableGeometry() const
-{
-    return m_screenInfo->availableGeometry();
-}
-
 void
 DashDeclarativeView::keyPressEvent(QKeyEvent* event)
 {

=== modified file 'places/app/dashdeclarativeview.h'
--- places/app/dashdeclarativeview.h	2011-10-03 11:13:44 +0000
+++ places/app/dashdeclarativeview.h	2011-10-21 11:42:24 +0000
@@ -32,8 +32,6 @@
     Q_PROPERTY(bool expanded READ expanded WRITE setExpanded NOTIFY expandedChanged)
     Q_PROPERTY(DashMode dashMode READ dashMode WRITE setDashMode NOTIFY dashModeChanged)
     Q_PROPERTY(QString activeLens READ activeLens WRITE setActiveLens NOTIFY activeLensChanged)
-    Q_PROPERTY(QRect screenGeometry READ screenGeometry NOTIFY screenGeometryChanged)
-    Q_PROPERTY(QRect availableGeometry READ availableGeometry NOTIFY availableGeometryChanged)
 
 public:
     enum DashMode {
@@ -46,8 +44,6 @@
     bool active() const;
     DashMode dashMode() const;
     const QString& activeLens() const;
-    const QRect screenGeometry() const;
-    QRect availableGeometry() const;
     bool expanded() const;
 
     /* setters */
@@ -67,9 +63,6 @@
     void expandedChanged(bool);
     void activeLensChanged(const QString&);
 
-    void screenGeometryChanged();
-    void availableGeometryChanged();
-
 protected:
     void resizeEvent(QResizeEvent*);
     virtual void showEvent(QShowEvent *event);

=== modified file 'spread/Windows.qml'
--- spread/Windows.qml	2011-08-09 13:33:24 +0000
+++ spread/Windows.qml	2011-10-21 11:42:24 +0000
@@ -32,9 +32,6 @@
 
    The context property called control is the initiator of the entire spread process, and
    is triggered by D-Bus calls on the C++ side.
-
-   The ScreenInfo's property availableGeometry represents the available space on the screen (i.e.
-   screen minus launcher, panels, etc.).
 */
 
 GridView {
@@ -147,8 +144,6 @@
                         name: "screen"
                         PropertyChanges {
                             target: spreadWindow
-                            /* Note that we subtract the availableGeometry x and y since window.location is
-                            expressed in global screen coordinates. */
                             x: window.position.x - declarativeView.globalPosition.x
                             y: window.position.y - declarativeView.globalPosition.y
                             width: window.size.width

=== modified file 'spread/Workspaces.qml'
--- spread/Workspaces.qml	2011-10-18 12:19:18 +0000
+++ spread/Workspaces.qml	2011-10-21 11:42:24 +0000
@@ -43,14 +43,14 @@
        FIXME: this seems to be broken in the case of 10 workspaces and 4x4 layout.
               it does only display a 3x3 grid for some reason.
     */
-    property bool isLayoutHorizontal: (columns * screen.availableGeometry.width) >
-                                      (rows * screen.availableGeometry.height)
+    property bool isLayoutHorizontal: (columns * screen.panelsFreeGeometry.width) >
+                                      (rows * screen.panelsFreeGeometry.height)
     property real cellScale: (isLayoutHorizontal) ? (availableWidth / columns / switcher.width) :
                                                     (availableHeight / rows / switcher.height)
 
     /* Scale of a workspace when the user zooms on it (fills most of the switcher, leaving a margin to see
        the corners of the other workspaces below it) */
-    property bool isDesktopHorizontal: screen.availableGeometry.width > screen.availableGeometry.height
+    property bool isDesktopHorizontal: screen.panelsFreeGeometry.width > screen.panelsFreeGeometry.height
     property real zoomedScale: (isDesktopHorizontal) ? ((width - 2*margin) / switcher.width) :
                                                        ((height - 2*margin) / switcher.height)
 

=== modified file 'spread/app/spreadview.cpp'
--- spread/app/spreadview.cpp	2011-10-03 11:13:44 +0000
+++ spread/app/spreadview.cpp	2011-10-21 11:42:24 +0000
@@ -38,7 +38,7 @@
 
     if(screen == current_screen)
     {
-        QRect geometry = m_screenInfo->availableGeometry();
+        QRect geometry = m_screenInfo->panelsFreeGeometry();
         setGeometry(geometry);
         setFixedSize(geometry.size());
     }