Author: titmuss
Date: Mon Jan 14 03:21:19 2008
New Revision: 1428
URL: http://svn.slimdevices.com?rev=1428&root=Jive&view=rev
Log:
Bug: N/A
Description:
Fix icon alignment issues.
Modified:
trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua
trunk/jive/src/pkg/jive/src/ui/jive_group.c
trunk/jive/src/pkg/jive/src/ui/jive_label.c
Modified:
trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=1428&root=Jive&r1=1427&r2=1428&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua Mon
Jan 14 03:21:19 2008
@@ -770,6 +770,7 @@
}
s.albumtitle.text.fg = SELECT_COLOR
s.albumtitle.icon = {}
+ s.albumtitle.icon.h = WH_FILL
s.albumtitle.icon.align = "left"
s.albumtitle.icon.img = Surface:loadImage(imgpath ..
"menu_album_noartwork.png")
s.albumtitle.icon.padding = { 9, 0, 0, 0 }
@@ -944,6 +945,7 @@
s.albumitem.text.fg = TEXT_COLOR
s.albumitem.text.sh = TEXT_SH_COLOR
s.albumitem.icon = {}
+ s.albumitem.icon.h = WH_FILL
s.albumitem.icon.align = "left"
s.albumitem.icon.img = Surface:loadImage(imgpath ..
"menu_album_noartwork.png")
s.albumitem.icon.padding = { 8, 0, 0, 0 }
@@ -1057,6 +1059,7 @@
s.albumcurrent.text.fg = TEXT_COLOR
s.albumcurrent.text.sh = TEXT_SH_COLOR
s.albumcurrent.icon = {}
+ s.albumcurrent.icon.h = WH_FILL
s.albumcurrent.icon.align = "center"
s.albumcurrent.icon.img = Surface:loadImage(imgpath ..
"menu_album_noartwork.png")
s.albumcurrent.icon.padding = { 6, 0, 0, 0 }
Modified: trunk/jive/src/pkg/jive/src/ui/jive_group.c
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/src/ui/jive_group.c?rev=1428&root=Jive&r1=1427&r2=1428&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/src/ui/jive_group.c (original)
+++ trunk/jive/src/pkg/jive/src/ui/jive_group.c Mon Jan 14 03:21:19 2008
@@ -181,8 +181,11 @@
sum_w += w[i];
}
- if (h != JIVE_WH_NIL && h != JIVE_WH_FILL) {
- h = MAX(h, peer->w.bounds.h - peer->w.padding.top -
peer->w.padding.bottom);
+ if (h == JIVE_WH_FILL) {
+ h = peer->w.bounds.h - peer->w.padding.top -
peer->w.padding.bottom;
+ }
+ else if (h != JIVE_WH_NIL && h != JIVE_WH_FILL) {
+ h = MIN(h, peer->w.bounds.h - peer->w.padding.top -
peer->w.padding.bottom);
}
x = peer->w.bounds.x + peer->w.padding.left;
Modified: trunk/jive/src/pkg/jive/src/ui/jive_label.c
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/src/ui/jive_label.c?rev=1428&root=Jive&r1=1427&r2=1428&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/src/ui/jive_label.c (original)
+++ trunk/jive/src/pkg/jive/src/ui/jive_label.c Mon Jan 14 03:21:19 2008
@@ -333,9 +333,9 @@
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);
-
- //jive_surface_boxColor(srf, peer->w.bounds.x,
peer->w.bounds.y, peer->w.bounds.x + peer->w.bounds.w-1, peer->w.bounds.y +
peer->w.bounds.h-1, 0xFF00007F);
- }
+ }
+
+ //jive_surface_boxColor(srf, peer->w.bounds.x, peer->w.bounds.y,
peer->w.bounds.x + peer->w.bounds.w-1, peer->w.bounds.y + peer->w.bounds.h-1,
0x00FF007F);
/* draw text label */
if (!(drawLayer && peer->num_lines)) {
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
