[Jive-Checkins] r1654 - in /trunk: ./ jive/src/pkg/jive/share/jive/ui/Menu.lua jive/src/pkg/jive/share/jive/ui/Window.lua

[titmuss]

Author: titmuss
Date: Sun Jan 27 13:24:07 2008
New Revision: 1654

URL: http://svn.slimdevices.com?rev=1654&root=Jive&view=rev
Log:
 [EMAIL PROTECTED] (orig r1649):  titmuss | 2008-01-27 21:21:55 +0000
 Bug: 5757
 Description:
 Do not start screensaver if cursor is spinning.
 
 

Modified:
    trunk/   (props changed)
    trunk/jive/src/pkg/jive/share/jive/ui/Menu.lua
    trunk/jive/src/pkg/jive/share/jive/ui/Window.lua

Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sun Jan 27 13:24:07 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1648
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1649
 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/Menu.lua
URL: 
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/ui/Menu.lua?rev=1654&root=Jive&r1=1653&r2=1654&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/ui/Menu.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/ui/Menu.lua Sun Jan 27 13:24:07 2008
@@ -398,6 +398,11 @@
 function lock(self, cancel)
        self.locked = cancel or true
        self:reLayout()
+
+       -- don't allow screensaver while locked
+       local window = self:getWindow()
+       self.lockedScreensaver = window:getAllowScreensaver()
+       window:setAllowScreensaver(false)
 end
 
 
@@ -410,6 +415,11 @@
 =cut
 --]]
 function unlock(self)
+       -- restore screensaver setting
+       local window = self:getWindow()
+       window:setAllowScreensaver(self.lockedScreensaver)
+       self.lockedScreensaver = nil
+
        self.locked = nil
        self:reLayout()
 end

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=1654&root=Jive&r1=1653&r2=1654&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/ui/Window.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/ui/Window.lua Sun Jan 27 13:24:07 2008
@@ -598,6 +598,11 @@
 end
 
 
+function getAllowScreensaver(self)
+       return self.allowScreensaver
+end
+
+
 function setAllowScreensaver(self, allowScreensaver)
        _assert(type(allowScreensaver) == "boolean" or type(allowScreensaver) 
== "function")
 
@@ -617,6 +622,11 @@
 end
 
 
+function getAlwaysOnTop(self)
+       return self.alwaysOnTop
+end
+
+
 function setAlwaysOnTop(self, alwaysOnTop)
        _assert(type(alwaysOnTop) == "boolean")
 
@@ -625,11 +635,21 @@
 end
 
 
+function getShowFrameworkWidgets(self)
+       return self.showFrameworkWidgets
+end
+
+
 function setShowFrameworkWidgets(self, showFrameworkWidgets)
        _assert(type(showFrameworkWidgets) == "boolean")
 
        self.showFrameworkWidgets = showFrameworkWidgets
        self:reLayout()
+end
+
+
+function getTransparent(self)
+       return self.transparent
 end
 
 

_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins