Author: bklaas
Date: Mon Jun 23 08:25:39 2008
New Revision: 2616
URL: http://svn.slimdevices.com?rev=2616&root=Jive&view=rev
Log:
Bug: 6504, 8479
Description: don't hardcode THUMB_SIZE in SlimBrowserApplet when icon size is
available through icon:getSize()
make sure that iconSize is non-zero, or else fall back to THUMB_SIZE
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=2616&root=Jive&r1=2615&r2=2616&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
Mon Jun 23 08:25:39 2008
@@ -338,6 +338,12 @@
s.title.text.font = FONT_BOLD_18px
s.title.text.fg = SELECT_COLOR
+--[[
+ s.title.icon = {}
+ s.title.icon.w = 56
+ s.title.icon.h = WH_FILL
+ s.title.icon.img = Surface:loadImage(imgpath ..
"menu_album_noartwork.png")
+--]]
-- Menu with three basic styles: normal, selected and locked
-- First define the dimesions of the menu
@@ -947,7 +953,6 @@
-
-- menus with artwork and song info
s.albummenu = {}
s.albummenu.padding = { 4, 2, 4, 2 }
@@ -1079,13 +1084,15 @@
}
)
- s.smalliconitemNoAction = _uses(s.albumitemNoAction)
+ s.smalliconitemNoAction = _uses(s.smalliconitem)
+
s.selected.smalliconitemNoAction = _uses(s.smalliconitemNoAction,
{
- bgImg = selectionBox,
- text = {
- fg = SELECT_COLOR,
- sh = SELECT_SH_COLOR
+ order = { 'icon', 'text' },
+ bgImg = selectionBox,
+ text = {
+ fg = SELECT_COLOR,
+ sh = SELECT_SH_COLOR
}
}
)
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=2616&root=Jive&r1=2615&r2=2616&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Mon Jun 23 08:25:39 2008
@@ -220,6 +220,9 @@
local iconSize
if icon then
iconSize = icon:getSize()
+ if not iconSize or iconSize == 0 then
+ iconSize = THUMB_SIZE
+ end
else
iconSize = THUMB_SIZE
end
@@ -832,7 +835,7 @@
if data.window['icon-id'] then
-- Fetch an image from
SlimServer
titleIcon = Icon("icon")
-
_server:fetchArtworkThumb(data.window["icon-id"], titleIcon, iconSize)
+
_server:fetchArtworkThumb(data.window["icon-id"], titleIcon, THUMB_SIZE)
-- only allow the existing icon to stay
if titleStyle isn't being changed
elseif not data.window.titleStyle and
titleWidget:getWidget('icon') then
titleIcon =
titleWidget:getWidget('icon')
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
