[Tora-cvs] SF.net SVN: tora: [2872] trunk/tora/src/totool.cpp

[<su...@us...>]

Revision: 2872
          http://tora.svn.sourceforge.net/tora/?rev=2872&view=rev
Author:   subik
Date:     2008-06-25 02:40:14 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
The mdi sub windows activation is forced to display. "Ambiguous shortcut overload: Ctrl+Return" should be fixed with it.

Modified Paths:
--------------
    trunk/tora/src/totool.cpp

Modified: trunk/tora/src/totool.cpp
===================================================================
--- trunk/tora/src/totool.cpp	2008-06-25 05:19:50 UTC (rev 2871)
+++ trunk/tora/src/totool.cpp	2008-06-25 09:40:14 UTC (rev 2872)
@@ -245,10 +245,6 @@
                 newsub->setWindowIcon(*icon);
             }
 
-            // workaround bug in mdi. deactivate subwindow first, then
-            // set active
-            main->workspace()->setActiveSubWindow(0);
-
             if(tool)
                 main->toolWidgetAdded(tool);
 
@@ -272,6 +268,14 @@
             if (max)
                 newWin->showMaximized();
 
+            // workaround bug in mdi. deactivate subwindow first, then
+            // set active
+            // WARNING: don't change this call order unles you know what
+            // are you doing ;) It's working now. When there is missing
+            // "previous" call, the toWorksheet tool do not get focus.
+            // Dunno why... it makes me mad.
+            main->workspace()->setActiveSubWindow(0);
+            main->workspace()->setActiveSubWindow(previous);
             main->workspace()->setActiveSubWindow(newsub);
 
             // piece of shit mdi doesn't always send window activated


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.