changeset 2176:17b152fca694 trunk

[svn] - somewhat fix textboxBitmapFontWidth,Height hints
author nenolod
date Tue, 19 Dec 2006 07:48:03 -0800
parents bba87eb04fab
children 8ebc85e1c559
files ChangeLog audacious/widgets/textbox.c
diffstat 2 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Dec 19 07:32:23 2006 -0800
+++ b/ChangeLog	Tue Dec 19 07:48:03 2006 -0800
@@ -1,3 +1,11 @@
+2006-12-19 15:32:23 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3355]
+  - fix skin.hints parsing for textbox
+  
+  trunk/audacious/mainwin.c |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2006-12-19 08:41:12 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [3353]
   - Remove Selected works sanely. closes #701.
--- a/audacious/widgets/textbox.c	Tue Dec 19 07:32:23 2006 -0800
+++ b/audacious/widgets/textbox.c	Tue Dec 19 07:48:03 2006 -0800
@@ -446,7 +446,7 @@
         return;
     }
 
-    tb->tb_pixmap_width = length * 5;
+    tb->tb_pixmap_width = length * bmp_active_skin->properties.textbox_bitmap_font_width;
     tb->tb_pixmap = gdk_pixmap_new(mainwin->window,
                                    tb->tb_pixmap_width, bmp_active_skin->properties.textbox_bitmap_font_height,
                                    gdk_rgb_get_visual()->depth);
@@ -461,7 +461,7 @@
             y = 0;
         }
         else if (c >= '0' && c <= '9') {
-            x = 5 * (c - '0');
+            x = bmp_active_skin->properties.textbox_bitmap_font_width * (c - '0');
             y = bmp_active_skin->properties.textbox_bitmap_font_height;
         }
         else
@@ -469,7 +469,8 @@
 
         skin_draw_pixmap(bmp_active_skin,
                          tb->tb_pixmap, gc, tb->tb_skin_index,
-                         x, y, i * 5, 0, 5, 6);
+                         x, y, i * bmp_active_skin->properties.textbox_bitmap_font_width, 0, bmp_active_skin->properties.textbox_bitmap_font_width, 
+			 bmp_active_skin->properties.textbox_bitmap_font_height);
     }
     g_free(pixmaptext);
 }