Author: titmuss
Date: Wed Mar 12 05:37:58 2008
New Revision: 2101

URL: http://svn.slimdevices.com?rev=2101&root=Jive&view=rev
Log:
Bug: 5429
Description:
Make the clock screensavers exit on motion.


Modified:
    trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockApplet.lua
    
trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua

Modified: trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockApplet.lua
URL: 
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockApplet.lua?rev=2101&root=Jive&r1=2100&r2=2101&view=diff
==============================================================================
--- trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockApplet.lua 
(original)
+++ trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockApplet.lua Wed 
Mar 12 05:37:58 2008
@@ -137,7 +137,7 @@
 
        -- register window as a screensaver
        local manager = appletManager:getAppletInstance("ScreenSavers")
-       manager:screensaverWindow(obj.window)
+       manager:screensaverWindow(obj.window, true)
 
        return obj
 end

Modified: 
trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
URL: 
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua?rev=2101&root=Jive&r1=2100&r2=2101&view=diff
==============================================================================
--- 
trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
 (original)
+++ 
trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
 Wed Mar 12 05:37:58 2008
@@ -181,7 +181,7 @@
 
 =cut
 --]]
-function screensaverWindow(self, window)
+function screensaverWindow(self, window, hideOnMotion)
        -- the screensaver is active when this window is pushed to the window 
stack
        window:addListener(EVENT_WINDOW_PUSH,
                           function(event)
@@ -226,6 +226,16 @@
                                   end
                                   return EVENT_UNUSED
                           end)
+
+       if hideOnMotion then
+               window:addListener(EVENT_MOTION,
+                                  function(event)
+                                          -- close all screensaver windows
+                                          for i,w in ipairs(self.active) do
+                                                  w:hide(Window.transitionNone)
+                                          end
+                                  end)
+       end
 end
 
 

_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins

Reply via email to