gimp r25484 - in trunk: . app/display

[neo svn gnome org]

Author: neo
Date: Mon Apr 14 12:57:23 2008
New Revision: 25484
URL: http://svn.gnome.org/viewvc/gimp?rev=25484&view=rev

Log:
2008-04-14  Sven Neumann  <sven gimp org>

	* app/display/gimpstatusbar.c: introduced a #define for the spacing
	between the icon and the statusbar label.


Modified:
   trunk/ChangeLog
   trunk/app/display/gimpstatusbar.c

Modified: trunk/app/display/gimpstatusbar.c
==============================================================================
--- trunk/app/display/gimpstatusbar.c	(original)
+++ trunk/app/display/gimpstatusbar.c	Mon Apr 14 12:57:23 2008
@@ -46,11 +46,13 @@
 #include "gimp-intl.h"
 
 
-/* maximal width of the string holding the cursor-coordinates for
- * the status line
- */
-#define CURSOR_LEN       256
+/*  maximal width of the string holding the cursor-coordinates  */
+#define CURSOR_LEN        256
 
+/*  spacing between the icon and the statusbar label            */
+#define ICON_SPACING        2
+
+/*  timeout (in milliseconds) for temporary statusbar messages  */
 #define MESSAGE_TIMEOUT  5000
 
 
@@ -507,10 +509,11 @@
               pixbuf = gtk_widget_render_icon (label, stock_id,
                                                GTK_ICON_SIZE_MENU, NULL);
 
-              handle_msg = (width + gdk_pixbuf_get_width (pixbuf) <
-                            label->allocation.width);
+              width += ICON_SPACING + gdk_pixbuf_get_width (pixbuf);
 
               g_object_unref (pixbuf);
+
+              handle_msg = (width < label->allocation.width);
             }
           else
             {
@@ -573,7 +576,7 @@
           rect.x      = 0;
           rect.y      = 0;
           rect.width  = PANGO_SCALE * (gdk_pixbuf_get_width (statusbar->icon) +
-                                       2);
+                                       ICON_SPACING);
           rect.height = PANGO_SCALE * gdk_pixbuf_get_height (statusbar->icon);
 
           attrs = pango_attr_list_new ();