Author: titmuss
Date: Mon Feb 18 14:26:13 2008
New Revision: 1984
URL: http://svn.slimdevices.com?rev=1984&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1982): titmuss | 2008-02-18 22:25:23 +0000
Bug: N/A
Description:
Fix bug where jive did not always reconnect to SC on resume. This was caused
by the
screensaver window forcing the spinny popup to close. Window:showInstead()
should not
hide alwaysOnTop windows.
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/jive/ui/Window.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Feb 18 14:26:13 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1981
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1982
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: trunk/jive/src/pkg/jive/share/jive/ui/Window.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/ui/Window.lua?rev=1984&root=Jive&r1=1983&r2=1984&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/ui/Window.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/ui/Window.lua Mon Feb 18 14:26:13 2008
@@ -207,10 +207,17 @@
=cut
--]]
function showInstead(self, transition)
- local last = Framework.windowStack[1]
+ local stack = Framework.windowStack
+
+ local idx = 1
+ local topwindow = stack[idx]
+ while topwindow and topwindow.alwaysOnTop do
+ idx = idx + 1
+ topwindow = stack[idx]
+ end
self:show(transition)
- last:hide()
+ topwindow:hide()
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
