Author: bklaas
Date: Tue Apr 15 09:31:13 2008
New Revision: 2236
URL: http://svn.slimdevices.com?rev=2236&root=Jive&view=rev
Log:
Bug: 6907
Description: pull in fix from DefaultSkinApplet for popupToast and textarea
element
the FullScreenSkin is too broken after the subversion re-branching to
understand if this is complete yet. Will revisit later.
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/FullscreenSkin/FullscreenSkinApplet.lua?rev=2236&root=Jive&r1=2235&r2=2236&view=diff
==============================================================================
---
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
(original)
+++
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
Tue Apr 15 09:31:13 2008
@@ -994,6 +994,24 @@
s.albumitem.icon.img = Surface:loadImage(imgpath ..
"menu_album_noartwork_125.png")
s.albumitem.icon.padding = 0
+ s.popupToast = _uses(s.albumitem,
+ {
+ order = { 'icon', 'text', 'textarea' },
+ textarea = {
+ w = WH_FILL,
+ h = WH_FILL,
+ padding = { 12, 20, 12, 12 }
+ },
+ text = {
+ padding = { 6, 15, 8, 8 }
+ },
+ icon = {
+ align = 'top-left',
+ border = { 12, 12, 0, 0 }
+ }
+ }
+ )
+
s.albumitemNoAction = {}
s.albumitemNoAction.order = { "text" }
s.albumitemNoAction.text = {}
@@ -1183,7 +1201,14 @@
s.popupplay.y = screenHeight - 96
s.popupplay.w = screenWidth / 2
s.popupplay.h = POPUP_HEIGHT
- s.popupplay.bgImg = helpBox
+
+ -- for textarea properties in popupplay
+ s.popupplay.padding = { 12, 12, 12, 0 }
+ s.popupplay.fg = TEXT_COLOR
+ s.popupplay.font = _font(TRACK_FONT_SIZE)
+ s.popupplay.align = "top-left"
+ s.popupplay.scrollbar = {}
+ s.popupplay.scrollbar.w = 0
s.popupplay.text = {}
s.popupplay.text.w = screenWidth
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
