Ticket #8188: NewEnhancedRaise.diff

src/apps/workspaces/Workspaces.cpp

@@ -533 +533 @@
     // Auto-Raise
 
     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 = BScreen(window).Frame();
+    
+    if (where.x != screenFrame.left && where.x != screenFrame.right 
+        && where.y != screenFrame.top && where.y != screenFrame.bottom)
+            return;
+    else {
+        BMessage settings;
+        BRect windowFrame = window->Frame();
+        float offset = kScreenBorderOffset / 2.0;
+        
+        if (window->GetDecoratorSettings(&settings) == B_OK){
+            BRect tabFrame = settings.FindRect("tab frame"); // Frame of the decorator tab
+            if (tabFrame.top <= screenFrame.top){ // Take into account tab height.
+                windowFrame.InsetBy(-(offset), -(tabFrame.bottom + offset));
+                if (screenFrame.Contains(windowFrame) && windowFrame.Contains(where))
+                    window->Activate();
+            } else { // Not at top, SAT decor turned on.
+                windowFrame.InsetBy(-(offset), -(offset));
+                if (screenFrame.Contains(windowFrame) && windowFrame.Contains(where))
+                    window->Activate();
+            }   
+        } else { //Window at edge within offset, without SAT Decor enabled.
+            windowFrame.InsetBy(-(offset), -(offset)); //We should still be lenient!
+            if (screenFrame.Contains(windowFrame) && windowFrame.Contains(where))
+                window->Activate();
+        }
+    } 
 }