Ticket #8188: EnhancedRaise.diff

src/apps/workspaces/Workspaces.cpp

@@ -531 +531 @@
         return;
 
     // Auto-Raise
+    
+    // Note: The Window Tab (decoration) will get in the way if placed 
+    // on the top edge. Rewrite when SAT Decorator API is documented.
 
     where = ConvertToScreen(where);
     BScreen screen(window);
-    BRect frame = screen.Frame();
-    if (where.x == frame.left || where.x == frame.right
-        || where.y == frame.top || where.y == frame.bottom) {
-        // cursor is on screen edge
-        if (window->Frame().Contains(where))
-            window->Activate();
+    BRect screenFrame = screen.Frame();
+    
+    if (where.x == screenFrame.left || where.x == screenFrame.right 
+        || where.y == screenFrame.top || where.y == screenFrame.bottom){
+            
+        BRect windowFrame = window->Frame();  // The actual Workspaces app frame
+        BPoint center(screenFrame.right / 2.0, screenFrame.bottom / 2.0);
+        BRect topLeftQuad = BRect(BPoint(0,0), center);
+        BRect topRightQuad = BRect(BPoint(center.x,0), 
+                             BPoint(screenFrame.right, center.y));
+        BRect bottomLeftQuad = BRect(BPoint(0,center.y), 
+                               BPoint(center.x,screenFrame.bottom));
+        
+        float fOffset = kScreenBorderOffset / 2.0; // kScreenBorderOffset is twice what we need.
+        
+        // If pointer is in top-left quad...
+        if (topLeftQuad.Contains(where)){
+            if (BRect(
+                    windowFrame.left - fOffset,
+                    windowFrame.top - fOffset,
+                    windowFrame.right,
+                    windowFrame.bottom
+                ).Contains(where))
+                window->Activate();
+        } 
+        else if (topRightQuad.Contains(where)){
+            if (BRect(
+                    windowFrame.left,         
+                    windowFrame.top - fOffset,
+                    windowFrame.right + fOffset,
+                    windowFrame.bottom
+                ).Contains(where))
+                window->Activate();
+        }
+        else if (bottomLeftQuad.Contains(where)){
+                if (BRect(
+                    windowFrame.left - fOffset,
+                    windowFrame.top,
+                    windowFrame.right,
+                    windowFrame.bottom + fOffset
+                ).Contains(where))
+                window->Activate();
+        }
+        else {
+                if (BRect(
+                    windowFrame.left,
+                    windowFrame.top,
+                    windowFrame.right + fOffset,
+                    windowFrame.bottom + fOffset
+                ).Contains(where))
+                window->Activate();
+        }
     }
 }