Author: richard
Date: Fri Feb 13 08:45:10 2009
New Revision: 4198
URL: http://svn.slimdevices.com?rev=4198&root=Jive&view=rev
Log:
r4...@harrypotter (orig r4196): richard | 2009-02-13 16:38:39 +0000
Bug: N/A
Description:
Fix broken merge.
r4...@harrypotter (orig r4197): richard | 2009-02-13 16:43:58 +0000
Bug: N/A
Description:
Add support for background images for Icons, they should work the same a
Labels.
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/Makefile.linux
7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_icon.c
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Feb 13 08:45:10 2009
@@ -4,7 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:4138
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4154
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4197
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: 7.4/branches/pango/squeezeplay/src/Makefile.linux
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/Makefile.linux?rev=4198&root=Jive&r1=4197&r2=4198&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/Makefile.linux (original)
+++ 7.4/branches/pango/squeezeplay/src/Makefile.linux Fri Feb 13 08:45:10 2009
@@ -156,8 +156,7 @@
#
.PHONY: app portaudio flac libmad tremor squeezeplay squeezeplay_desktop
squeezeplay_contrib squeezeplay_private freefont freefont-debian axtls
-app: portaudio flac libmad tremor ${SPPRIVATE_TARGETS} squeezeplay
squeezeplay_desktop squeezeplay_contrib squeezeplay_tgz
-freefont squeezeplay_tgz
+app: portaudio flac libmad tremor ${SPPRIVATE_TARGETS} squeezeplay
squeezeplay_desktop squeezeplay_contrib freefont squeezeplay_tgz
# portaudio
portaudio_v19_1360/Makefile:
Modified: 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_icon.c
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_icon.c?rev=4198&root=Jive&r1=4197&r2=4198&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_icon.c (original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_icon.c Fri Feb
13 08:45:10 2009
@@ -14,6 +14,7 @@
JiveSurface *img;
JiveSurface *default_img;
+ JiveTile *bg_tile;
Uint32 anim_frame;
Uint32 anim_total;
@@ -39,6 +40,7 @@
int jiveL_icon_skin(lua_State *L) {
IconWidget *peer;
+ JiveTile *bg_tile;
JiveSurface *img;
/* stack is:
@@ -74,6 +76,14 @@
peer->frame_rate = jive_style_int(L, 1, "frameRate", 0);
if (peer->frame_rate) {
peer->frame_width = jive_style_int(L, 1, "frameWidth", -1);
+ }
+
+ bg_tile = jive_style_tile(L, 1, "bgImg", NULL);
+ if (bg_tile != peer->bg_tile) {
+ if (peer->bg_tile) {
+ jive_tile_free(peer->bg_tile);
+ }
+ peer->bg_tile = jive_tile_ref(bg_tile);
}
peer->align = jive_style_align(L, 1, "align", JIVE_ALIGN_TOP_LEFT);
@@ -236,6 +246,10 @@
JiveSurface *srf = tolua_tousertype(L, 2, 0);
bool drawLayer = luaL_optinteger(L, 3, JIVE_LAYER_ALL) & peer->w.layer;
+ if (drawLayer && peer->bg_tile) {
+ jive_tile_blit(peer->bg_tile, srf, peer->w.bounds.x,
peer->w.bounds.y, peer->w.bounds.w, peer->w.bounds.h);
+ }
+
if (!drawLayer || !peer->img) {
return 0;
}
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
