Apply Guichan's changes from 98d94808f26240a1e7af77513a146cc9c2a870fd…

… (Aug 4th 2008) http://code.google.com/p/guichan/issues/detail?id=43
kallisti5 · Aug 27, 2024 · dc1a1a5 · dc1a1a5
1 parent 69e01cf
commit dc1a1a5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/TODO b/TODO
@@ -1,4 +1,4 @@
-* Continue rebasing from 98d94808f26240a1e7af77513a146cc9c2a870fd
+* Continue rebasing from 24a11fbf50826a76862ff5667d371981628a0cbc
 * Add a focus listener interface.
 * Make focus apply synchronously.
 * Graphics and input objects for DirectX.

diff --git a/src/widgets/tabbedarea.cpp b/src/widgets/tabbedarea.cpp
@@ -428,8 +428,7 @@ namespace gcn
 
     void TabbedArea::mousePressed(MouseEvent& mouseEvent)
     {
-        if (mouseEvent.isConsumed()
-            && mouseEvent.getSource()->isFocusable())
+        if (mouseEvent.isConsumed())
         {
             return;
         }
@@ -445,7 +444,13 @@ namespace gcn
             }
         }
 
-        requestFocus();
+        // Request focus only if the source of the event is not focusable.
+        // If the source of the event is focused
+        // we don't want to steal the focus.
+        if (!mouseEvent.getSource()->isFocusable())
+        {
+            requestFocus();
+        }
     }
 
     void TabbedArea::death(const Event& event)