Author: titmuss
Date: Sun Jan 27 13:21:55 2008
New Revision: 1649
URL: http://svn.slimdevices.com?rev=1649&root=Jive&view=rev
Log:
Bug: 5757
Description:
Do not start screensaver if cursor is spinning.
Modified:
branches/7.0/jive/src/pkg/jive/share/jive/ui/Menu.lua
branches/7.0/jive/src/pkg/jive/share/jive/ui/Window.lua
Modified: branches/7.0/jive/src/pkg/jive/share/jive/ui/Menu.lua
URL:
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive/share/jive/ui/Menu.lua?rev=1649&root=Jive&r1=1648&r2=1649&view=diff
==============================================================================
--- branches/7.0/jive/src/pkg/jive/share/jive/ui/Menu.lua (original)
+++ branches/7.0/jive/src/pkg/jive/share/jive/ui/Menu.lua Sun Jan 27 13:21:55
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: branches/7.0/jive/src/pkg/jive/share/jive/ui/Window.lua
URL:
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive/share/jive/ui/Window.lua?rev=1649&root=Jive&r1=1648&r2=1649&view=diff
==============================================================================
--- branches/7.0/jive/src/pkg/jive/share/jive/ui/Window.lua (original)
+++ branches/7.0/jive/src/pkg/jive/share/jive/ui/Window.lua Sun Jan 27 13:21:55
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
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins