keep electric edges 1/3" away from the corners

BUG: 318294
FIXED: 4.11
REVIEW: 110013

screenedge.cpp

@@ -59,7 +59,7 @@ Edge::Edge(ScreenEdges *parent)
     , m_action(ElectricActionNone)
     , m_reserved(0)
     , m_approaching(false)
-    , m_lastApproachingFactor(0.0)
+    , m_lastApproachingFactor(0)
     , m_blocked(false)
 {
 }
@@ -290,8 +290,7 @@ void Edge::setGeometry(const QRect &geometry)
     int y = m_geometry.y();
     int width = m_geometry.width();
     int height = m_geometry.height();
-    // TODO: better not hard coded value
+    const int size = m_edges->cornerOffset();
-    const int size = 20;
     if (isCorner()) {
         if (isRight()) {
             x = x - size +1;
@@ -365,7 +364,7 @@ void Edge::startApproaching()
     }
     m_approaching = true;
     doStartApproaching();
-    m_lastApproachingFactor = 0.0;
+    m_lastApproachingFactor = 0;
     emit approaching(border(), 0.0, m_approachGeometry);
 }
 
@@ -380,7 +379,7 @@ void Edge::stopApproaching()
     }
     m_approaching = false;
     doStopApproaching();
-    m_lastApproachingFactor = 0.0;
+    m_lastApproachingFactor = 0;
     emit approaching(border(), 0.0, m_approachGeometry);
 }
 
@@ -391,42 +390,42 @@ void Edge::doStopApproaching()
 void Edge::updateApproaching(const QPoint &point)
 {
     if (approachGeometry().contains(point)) {
-        qreal factor = 0.0;
+        int factor = 0;
+        const int edgeDistance = m_edges->cornerOffset();
         // manhattan length for our edge
-        const qreal cornerDistance = 40.0;
+        const int cornerDistance = 2*edgeDistance;
-        const qreal edgeDistance = 20.0;
         switch (border()) {
         case ElectricTopLeft:
-            factor = point.manhattanLength() / cornerDistance;
+            factor = (point.manhattanLength()<<8) / cornerDistance;
             break;
         case ElectricTopRight:
-            factor = (point - approachGeometry().topRight()).manhattanLength() / cornerDistance;
+            factor = ((point - approachGeometry().topRight()).manhattanLength()<<8) / cornerDistance;
             break;
         case ElectricBottomRight:
-            factor = (point - approachGeometry().bottomRight()).manhattanLength() / cornerDistance;
+            factor = ((point - approachGeometry().bottomRight()).manhattanLength()<<8) / cornerDistance;
             break;
         case ElectricBottomLeft:
-            factor = (point - approachGeometry().bottomLeft()).manhattanLength() / cornerDistance;
+            factor = ((point - approachGeometry().bottomLeft()).manhattanLength()<<8) / cornerDistance;
             break;
         case ElectricTop:
-            factor = qAbs(point.y() - approachGeometry().y()) / edgeDistance;
+            factor = (qAbs(point.y() - approachGeometry().y())<<8) / edgeDistance;
             break;
         case ElectricRight:
-            factor = qAbs(point.x() - approachGeometry().right()) / edgeDistance;
+            factor = (qAbs(point.x() - approachGeometry().right())<<8) / edgeDistance;
             break;
         case ElectricBottom:
-            factor = qAbs(point.y() - approachGeometry().bottom()) / edgeDistance;
+            factor = (qAbs(point.y() - approachGeometry().bottom())<<8) / edgeDistance;
             break;
         case ElectricLeft:
-            factor = qAbs(point.x() - approachGeometry().x()) / edgeDistance;
+            factor = (qAbs(point.x() - approachGeometry().x())<<8) / edgeDistance;
             break;
         default:
             break;
         }
-        factor = 1.0 - factor;
+        factor = 256 - factor;
         if (m_lastApproachingFactor != factor) {
             m_lastApproachingFactor = factor;
-            emit approaching(border(), m_lastApproachingFactor, m_approachGeometry);
+            emit approaching(border(), m_lastApproachingFactor/256.0f, m_approachGeometry);
         }
     } else {
         stopApproaching();
@@ -552,6 +551,8 @@ ScreenEdges::ScreenEdges(QObject *parent)
     , m_actionBottomLeft(ElectricActionNone)
     , m_actionLeft(ElectricActionNone)
 {
+    QWidget w;
+    m_cornerOffset = (w.physicalDpiX() + w.physicalDpiY() + 5) / 6;
 }
 
 ScreenEdges::~ScreenEdges()
@@ -829,15 +830,15 @@ void ScreenEdges::createVerticalEdge(ElectricBorder border, const QRect &screen,
     const int x = (border == ElectricLeft) ? screen.x() : screen.x() + screen.width() -1;
     if (isTopScreen(screen, fullArea)) {
         // also top most screen
-        height--;
+        height -= m_cornerOffset;
-        y++;
+        y += m_cornerOffset;
         // create top left/right edge
         const ElectricBorder edge = (border == ElectricLeft) ? ElectricTopLeft : ElectricTopRight;
         m_edges << createEdge(edge, x, screen.y(), 1, 1);
     }
     if (isBottomScreen(screen, fullArea)) {
         // also bottom most screen
-        height--;
+        height -= m_cornerOffset;
         // create bottom left/right edge
         const ElectricBorder edge = (border == ElectricLeft) ? ElectricBottomLeft : ElectricBottomRight;
         m_edges << createEdge(edge, x, screen.y() + screen.height() -1, 1, 1);
@@ -855,12 +856,12 @@ void ScreenEdges::createHorizontalEdge(ElectricBorder border, const QRect &scree
     int width = screen.width();
     if (isLeftScreen(screen, fullArea)) {
         // also left most - adjust only x and width
-        x++;
+        x += m_cornerOffset;
-        width--;
+        width -= m_cornerOffset;
     }
     if (isRightScreen(screen, fullArea)) {
         // also right most edge
-        width--;
+        width -= m_cornerOffset;
     }
     const int y = (border == ElectricTop) ? screen.y() : screen.y() + screen.height() - 1;
     m_edges << createEdge(border, x, y, width, 1);

screenedge.h

@@ -106,7 +106,7 @@ private:
     QPoint m_triggeredPoint;
     QHash<QObject *, QByteArray> m_callBacks;
     bool m_approaching;
-    qreal m_lastApproachingFactor;
+    int m_lastApproachingFactor;
     bool m_blocked;
 };
 
@@ -216,6 +216,10 @@ public:
      * @param forceNoPushBack needs to be called to workaround some DnD clients, don't use unless you want to chek on a DnD event
      */
     void check(const QPoint& pos, const QDateTime &now, bool forceNoPushBack = false);
+    /**
+     * The (dpi dependent) length, reserved for the active corners of each edge - 1/3"
+     */
+    int cornerOffset() const;
     /**
      * Mark the specified screen edge as reserved. This method is provided for external activation
      * like effects and scripts. When the effect/script does no longer need the edge it is supposed
@@ -333,6 +337,7 @@ private:
     ElectricBorderAction m_actionBottom;
     ElectricBorderAction m_actionBottomLeft;
     ElectricBorderAction m_actionLeft;
+    int m_cornerOffset;
 
     KWIN_SINGLETON(ScreenEdges)
 };
@@ -449,6 +454,10 @@ inline void ScreenEdges::setConfig(KSharedConfig::Ptr config)
     m_config = config;
 }
 
+inline int ScreenEdges::cornerOffset() const {
+    return m_cornerOffset;
+}
+
 inline const QSize &ScreenEdges::cursorPushBackDistance() const
 {
     return m_cursorPushBackDistance;