Author: richard
Date: Tue Feb 17 10:08:49 2009
New Revision: 4244
URL: http://svn.slimdevices.com/jive?rev=4244&view=rev
Log:
r4...@harrypotter (orig r4243): richard | 2009-02-17 14:54:19 +0000
Bug: N/A
Description:
Fix the minimum tile size so that tiles are not drawn outside of the widgets
bounding box.
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_tile.c
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Feb 17 10:08:49 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:4237
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4243
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/squeezeplay/src/ui/jive_tile.c
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_tile.c?rev=4244&r1=4243&r2=4244&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_tile.c (original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_tile.c Tue Feb
17 10:08:49 2009
@@ -348,12 +348,14 @@
#endif //JIVE_PROFILE_BLIT
Uint16 mw, mh;
- jive_tile_get_min_size(tile, &mw, &mh);
- if (dw < mw) {
- dw = mw;
- }
- if (dh < mh) {
- dh = mh;
+ if (!dw || !dh) {
+ jive_tile_get_min_size(tile, &mw, &mh);
+ if (!dw) {
+ dw = mw;
+ }
+ if (!dh) {
+ dh = mh;
+ }
}
_blit_tile(tile, dst, dx, dy, dw, dh);
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
