Author: titmuss
Date: Wed Nov 19 06:37:44 2008
New Revision: 3404
URL: http://svn.slimdevices.com?rev=3404&root=Jive&view=rev
Log:
Bug: N/A
Description:
Reverted r3400 and fixed in a different way after feedback from Ben.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Textarea.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Textarea.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Textarea.lua?rev=3404&root=Jive&r1=3403&r2=3404&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Textarea.lua (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Textarea.lua Wed Nov 19
06:37:44 2008
@@ -210,12 +210,6 @@
self:scrollBy( self.visibleLines - 1 )
return EVENT_CONSUME
- elseif keycode == KEY_GO or
- keycode == KEY_RIGHT then
- self:playSound("BUMP")
- self:getWindow():bumpRight()
- return EVENT_CONSUME
-
elseif keycode == KEY_BACK or
keycode == KEY_LEFT then
self:playSound("WINDOWHIDE")
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua?rev=3404&root=Jive&r1=3403&r2=3404&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua Wed Nov 19
06:37:44 2008
@@ -74,6 +74,8 @@
local EVENT_UNUSED = jive.ui.EVENT_UNUSED
local KEY_BACK = jive.ui.KEY_BACK
+local KEY_GO = jive.ui.KEY_GO
+local KEY_RIGHT = jive.ui.KEY_RIGHT
local FRAME_RATE = jive.ui.FRAME_RATE
local LAYER_ALL = jive.ui.LAYER_ALL
@@ -153,6 +155,21 @@
)
end
+ -- by default bump the window on GO or RIGHT, add this as a
+ -- listener to allow other handlers to act on these events
+ -- first
+ obj:addListener(EVENT_KEY_PRESS,
+ function(event)
+ local keycode = event:getKeycode()
+ if keycode == KEY_GO or
+ keycode == KEY_RIGHT then
+ obj:playSound("BUMP")
+ obj:getWindow():bumpRight()
+ return EVENT_CONSUME
+ end
+ end)
+
+
return obj
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=3404&root=Jive&r1=3403&r2=3404&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Wed Nov 19 06:37:44 2008
@@ -151,9 +151,7 @@
window:addWidget(textarea)
window:addWidget(help)
- window:focusWidget(textarea)
-
- textarea:addListener(EVENT_KEY_PRESS,
+ window:addListener(EVENT_KEY_PRESS,
function(event)
local keycode = event:getKeycode()
if keycode == KEY_GO then
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=3404&root=Jive&r1=3403&r2=3404&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Wed Nov 19 06:37:44 2008
@@ -232,9 +232,7 @@
window:addWidget(navcluster)
window:addWidget(help)
- window:focusWidget(textarea)
-
- textarea:addListener(EVENT_KEY_PRESS,
+ window:addListener(EVENT_KEY_PRESS,
function(event)
local keycode = event:getKeycode()
if keycode == KEY_GO or
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
