r6281 - trunk/gnue-forms/src/uidrivers/gtk2/widgets

[johannes]

Author: johannes
Date: 2004-09-14 09:27:04 -0500 (Tue, 14 Sep 2004)
New Revision: 6281

Modified:
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
Log:
Fixed focusmanagement in multi-row blocks


Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py        2004-09-14 
14:07:55 UTC (rev 6280)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py        2004-09-14 
14:27:04 UTC (rev 6281)
@@ -132,12 +132,14 @@
       gfObject = self._uiDriver._WidgetToGFObj [lookupWidget]
       _formRef = gfObject._form
 
-      if _formRef._currentEntry == gfObject:
+      if _formRef._currentEntry == gfObject and \
+         self.widgets.index (lookupWidget) == gfObject._visibleIndex:
         gDebug (1, "SKIPPING since we already have the focus!")
         return gtk.FALSE
 
-      action = events.Event ('requestFOCUS', gfObject, _form = _formRef)
-      self._eventHandler (action)
+      if _formRef._currentEntry != gfObject:
+        action = events.Event ('requestFOCUS', gfObject, _form = _formRef)
+        self._eventHandler (action)
 
       adjust = self.widgets.index (lookupWidget) - gfObject._visibleIndex
       if adjust: