Merge lp:~saviq/unity-2d/titlebar-dblclick into lp:unity-2d

[Michał Sawicz]

[panel] double click or drag titleBar to unmaximize

[Alberto Mardegan (mardy)]

Great work, Michał!
The double click part seems to work quite reliably; however, I noticed a very strange behaviour with the dragging: if you drag the mouse cursor over the indicators (be it the applets, or the application menus) and then continue dragging down and immediately stop as soon as the window gets unmaximized, the mouse cursor remains in its "dragging" form, and all keyboard input seems to be disabled (for instance, you cannot switch desktop with Ctrl+Alt+Right) except for the ESC key, which brings the window back to the maximized mode.

Also, please adjust the coding style to put "*" and "&" next to the type name, and not next to the variable name.

review: Needs Fixing

[Alberto Mardegan (mardy)]

Sorry, the description of the way to trigger the bug is wrong: it has actually nothing to do on whether the cursor hovers the indicators, and can happen even if you simply drag it down just vertically.
It's rather hard to reproduce, actually.

[Michał Sawicz (saviq)]

I've just put this in a ppa (ppa:saviq/junk) but LP is slow to pick it up... so when you guys find the time to check it out, check in the PPA, and if it's not there just build it yourselves ;P

[Michał Sawicz (saviq)]

Make that ppa:saviq/stuff...

[Gerry Boland (gerboland)]

Hey Michał,
it does work nicely (with multimonitors too). I could not reproduce Alberto's bug.

Only little thing that bothered me:
- maximise window, then grab very top of titlebar and drag down. When it un-maximises, mouse is grabbing very bottom of the titlebar.
But really that's just me being pedantic.

review: Approve

[Gerry Boland (gerboland)]

Bug: Double right-click on maximised titlebar makes it un-maximise.

Question: should a right-click on maximised titlebar open the usual window-tools dropdown menu (Maximise, Minimise, Move...)?

[Łukasz Zemczak (sil2100)]

Works nicely here as well. I did some stress-tests and it still maximized/un-maximized correctly. Could not reproduce the bug mentioned by Alberto on my laptop as (Ubuntu 11.10) - both with a mouse and a touchpad. As for me - everything seems nice as it is.

review: Approve

[Alberto Mardegan (mardy)]

It may be that I have something wrong with my laptop touchpad; in a while I'll try with an external mouse, and see if it still happens.

Meanwhile, I found another issue: if you start gnome-terminal, when restoring the window via a doubleclick the window is restored to a geometry which is not the same used when restoring it via the titlebar restore button or by dragging the window out of the titlebar: the hight becomes much higher.

Curiously, this does not happen in gedit or firefox, so it's all rather suspicious.

[Gerry Boland (gerboland)]

I managed to reproduce Alberto's Terminal bug now too.

When I opened a Terminal window, maximised and unmaximised it 4 times, the 4th time the window geometry changes.

I could not reproduce this with the current unity-2d trunk (using max/unmax buttons).

gnome-terminal height has always behaved strangely for me. I tried other apps but they all work fine.

[Michał Sawicz (saviq)]

Dnia 2011-09-26, pon o godzinie 10:14 +0000, Gerry Boland pisze:
> When I opened a Terminal window, maximised and unmaximised it 4 times,
> the 4th time the window geometry changes.

I can't reproduce... I wonder how related is it to bug #822897 - I've
had the terminal behave that way, too.

@gerboland re: cursor position - that's not something we can control,
AFAIK. The WM receives an x/y coordinate of where the dragging started
and does its magic. It's probably related to decorations not being part
of the window or something.

Thanks for all the reviews!
--
Michał Sawicz <email address hidden>

[lp:~saviq/unity-2d/titlebar-dblclick]

738. By Michał Sawicz on 2011-09-27

[panel] follow style guidelines

739. By Michał Sawicz on 2011-09-27

[panel] missing indent

[Alberto Mardegan (mardy)]

Thanks Michał! I tried it now, and it works great.
Just one style issue again: check the indentation of line 126 in appnameapplet.h: it should be aligned with the first character after "(".

[lp:~saviq/unity-2d/titlebar-dblclick]

740. By Michał Sawicz on 2011-09-27

[panel] another style fix

[Alberto Mardegan (mardy)]

Damn, it's perfect! ;-)

review: Approve

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2011-09-15 09:56:14 +0000
+++ panel/applets/appname/appnameapplet.cpp	2011-09-27 12:02:24 +0000
@@ -47,6 +47,8 @@
 #include <QPainter>
 #include <QApplication>
 #include <QDesktopWidget>
+#include <QMouseEvent>
+#include <QPoint>
 
 static const int APPNAME_LABEL_LEFT_MARGIN = 6;
 
@@ -125,6 +127,12 @@
     QLabel* m_label;
     WindowHelper* m_windowHelper;
     MenuBarWidget* m_menuBarWidget;
+    QPoint m_dragStartPosition;
+    bool m_dragInProgress;
+
+    AppNameAppletPrivate()
+    : m_dragInProgress(false)
+    {}
 
     void setupLabel()
     {
@@ -270,4 +278,37 @@
     updateWidgets();
 }
 
+void AppNameApplet::mouseDoubleClickEvent(QMouseEvent*) {
+    d->m_windowHelper->unmaximize();
+}
+
+void AppNameApplet::mousePressEvent(QMouseEvent* event) {
+    if (event->button() == Qt::LeftButton) {
+        d->m_dragStartPosition = event->pos();
+        d->m_dragInProgress = true;
+    } else {
+        Unity2d::PanelApplet::mousePressEvent(event);
+    }
+}
+
+void AppNameApplet::mouseReleaseEvent(QMouseEvent* event) {
+    if (d->m_dragInProgress && event->button() == Qt::LeftButton) {
+        d->m_dragInProgress = false;
+    } else {
+        Unity2d::PanelApplet::mouseReleaseEvent(event);
+    }
+}
+
+void AppNameApplet::mouseMoveEvent(QMouseEvent* event) {
+    if (d->m_dragInProgress && (event->buttons() & Qt::LeftButton)) {
+        if ((event->pos() - d->m_dragStartPosition).manhattanLength()
+                >= QApplication::startDragDistance()) {
+            d->m_dragInProgress = false;
+            d->m_windowHelper->drag(d->m_dragStartPosition);
+        }
+    } else {
+        Unity2d::PanelApplet::mouseReleaseEvent(event);
+    }
+}
+
 #include "appnameapplet.moc"

=== modified file 'panel/applets/appname/appnameapplet.h'
--- panel/applets/appname/appnameapplet.h	2011-08-22 09:17:03 +0000
+++ panel/applets/appname/appnameapplet.h	2011-09-27 12:02:24 +0000
@@ -40,10 +40,17 @@
 protected:
     void enterEvent(QEvent*);
     void leaveEvent(QEvent*);
+    void mouseDoubleClickEvent(QMouseEvent*);
+    void mousePressEvent(QMouseEvent*);
+    void mouseReleaseEvent(QMouseEvent*);
+    void mouseMoveEvent(QMouseEvent*);
 
 private Q_SLOTS:
     void updateWidgets();
 
+Q_SIGNALS:
+    void titleBarDblClicked();
+
 private:
     Q_DISABLE_COPY(AppNameApplet)
     AppNameAppletPrivate* const d;

=== modified file 'panel/applets/appname/windowhelper.cpp'
--- panel/applets/appname/windowhelper.cpp	2011-07-13 12:47:02 +0000
+++ panel/applets/appname/windowhelper.cpp	2011-09-27 12:02:24 +0000
@@ -42,6 +42,12 @@
 #include <QDateTime>
 #include <QApplication>
 #include <QDesktopWidget>
+#include <QPoint>
+
+// X11
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <QX11Info>
 
 struct WindowHelperPrivate
 {
@@ -157,4 +163,27 @@
     wnck_window_unmaximize(d->m_window);
 }
 
+void WindowHelper::drag(const QPoint& pos)
+{
+    // this code IMO should ultimately belong to wnck
+    if (wnck_window_is_maximized(d->m_window)) {
+        XEvent xev;
+        QX11Info info;
+        Atom netMoveResize = XInternAtom(QX11Info::display(), "_NET_WM_MOVERESIZE", false);
+        xev.xclient.type = ClientMessage;
+        xev.xclient.message_type = netMoveResize;
+        xev.xclient.display = QX11Info::display();
+        xev.xclient.window = wnck_window_get_xid(d->m_window);
+        xev.xclient.format = 32;
+        xev.xclient.data.l[0] = pos.x();
+        xev.xclient.data.l[1] = pos.y();
+        xev.xclient.data.l[2] = 8; // _NET_WM_MOVERESIZE_MOVE
+        xev.xclient.data.l[3] = Button1;
+        xev.xclient.data.l[4] = 0;
+        XUngrabPointer(QX11Info::display(), QX11Info::appTime());
+        XSendEvent(QX11Info::display(), QX11Info::appRootWindow(info.screen()), false,
+                   SubstructureRedirectMask | SubstructureNotifyMask, &xev);
+    }
+}
+
 #include "windowhelper.moc"

=== modified file 'panel/applets/appname/windowhelper.h'
--- panel/applets/appname/windowhelper.h	2011-03-30 16:21:18 +0000
+++ panel/applets/appname/windowhelper.h	2011-09-27 12:02:24 +0000
@@ -27,6 +27,8 @@
 // Qt
 #include <QObject>
 
+class QPoint;
+
 struct WindowHelperPrivate;
 class WindowHelper : public QObject
 {
@@ -44,6 +46,7 @@
     void close();
     void minimize();
     void unmaximize();
+    void drag(const QPoint& pos);
 
 private Q_SLOTS:
     void update();