fakevim: Fix "ctrl-w + arrow" movement between views

There were a couple of sign error and mis-measurements in the functions
used to elect the target view when doing a ctrl-w + arrow movement.
This commit fixes the sign errors, and changes the choice algorithm so
that the elected view is the one with its center closest to the
cursor.

Change-Id: I7890c4816b6625d062262ee939150b5391ea6245
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk121@nokiamail.com>

src/plugins/fakevim/fakevimplugin.cpp

@@ -1224,54 +1224,41 @@ void FakeVimPluginPrivate::setActionChecked(const Id &id, bool check)
 
 static int moveRightWeight(const QRect &cursor, const QRect &other)
 {
-    int dx = other.left() - cursor.right();
+    const int dx = other.left() - cursor.right();
     if (dx < 0)
         return -1;
-    int w = 10000 * dx;
+    const int dy = qAbs(cursor.center().y() - other.center().y());
-    int dy1 = cursor.top() - other.bottom();
+    const int w = 10000 * dx + dy;
-    int dy2 = cursor.bottom() - other.top();
-    w += dy1 * (dy1 > 0);
-    w += dy2 * (dy2 > 0);
-    qDebug() << "      DX: " << dx << dy1 << dy2 << w;
     return w;
 }
 
 static int moveLeftWeight(const QRect &cursor, const QRect &other)
 {
-    int dx = other.right() - cursor.left();
+    const int dx = cursor.left() - other.right();
     if (dx < 0)
         return -1;
-    int w = 10000 * dx;
+    const int dy = qAbs(cursor.center().y() -other.center().y());
-    int dy1 = cursor.top() - other.bottom();
+    const int w = 10000 * dx + dy;
-    int dy2 = cursor.bottom() - other.top();
-    w += dy1 * (dy1 > 0);
-    w += dy2 * (dy2 > 0);
     return w;
 }
 
 static int moveUpWeight(const QRect &cursor, const QRect &other)
 {
-    int dy = other.bottom() - cursor.top();
+    const int dy = cursor.top() - other.bottom();
     if (dy < 0)
         return -1;
-    int w = 10000 * dy;
+    const int dx = qAbs(cursor.center().x() - other.center().x());
-    int dx1 = cursor.left() - other.right();
+    const int w = 10000 * dy + dx;
-    int dx2 = cursor.right() - other.left();
-    w += dx1 * (dx1 > 0);
-    w += dx2 * (dx2 > 0);
     return w;
 }
 
 static int moveDownWeight(const QRect &cursor, const QRect &other)
 {
-    int dy = other.top() - cursor.bottom();
+    const int dy = other.top() - cursor.bottom();
     if (dy < 0)
         return -1;
-    int w = 10000 * dy;
+    const int dx = qAbs(cursor.center().x() - other.center().x());
-    int dx1 = cursor.left() - other.right();
+    const int w = 10000 * dy + dx;
-    int dx2 = cursor.right() - other.left();
-    w += dx1 * (dx1 > 0);
-    w += dx2 * (dx2 > 0);
     return w;
 }