[maemo-commits] [maemo-commits] r12877 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-07-27 15:37:22 +0300 (Fri, 27 Jul 2007)
New Revision: 12877

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkcellrenderertoggle.c
   projects/haf/trunk/gtk+/gtk/gtkcheckmenuitem.c
   projects/haf/trunk/gtk+/gtk/gtkstyle.c
Log:
2007-07-27  Michael Natterer  <mitch at imendio.com>

	Merge from trunk:

	Fix check/radio indicator drawing mess (bug #452225):

	* gtk/gtkstyle.c (gtk_default_draw_check): really decrease the
	indicator size by one to ensure odd size (don't say -= -1).

	* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
	removed -1 adjustment from calls to gtk_paint_option(). Theme
	engines now get the actually configured size passed, not one pixel
	less.

	* gtk/gtkcellrenderertoggle.c
	* gtk/gtkcheckmenuitem.c: changed default indicator size from 12
	to 13 so all widgets which draw check/option indicators have the
	same default size now (and render the same size after above
	changes).



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-07-27 12:19:27 UTC (rev 12876)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-07-27 12:37:22 UTC (rev 12877)
@@ -1,3 +1,23 @@
+2007-07-27  Michael Natterer  <mitch at imendio.com>
+
+	Merge from trunk:
+
+	Fix check/radio indicator drawing mess (bug #452225):
+
+	* gtk/gtkstyle.c (gtk_default_draw_check): really decrease the
+	indicator size by one to ensure odd size (don't say -= -1).
+
+	* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
+	removed -1 adjustment from calls to gtk_paint_option(). Theme
+	engines now get the actually configured size passed, not one pixel
+	less.
+
+	* gtk/gtkcellrenderertoggle.c
+	* gtk/gtkcheckmenuitem.c: changed default indicator size from 12
+	to 13 so all widgets which draw check/option indicators have the
+	same default size now (and render the same size after above
+	changes).
+
 2007-07-25  Xan Lopez  <xan.lopez at nokia.com>
 
 	* gtk/gtkmain.c (gtk_main_do_event): send insensitive-press only

Modified: projects/haf/trunk/gtk+/gtk/gtkcellrenderertoggle.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkcellrenderertoggle.c	2007-07-27 12:19:27 UTC (rev 12876)
+++ projects/haf/trunk/gtk+/gtk/gtkcellrenderertoggle.c	2007-07-27 12:37:22 UTC (rev 12877)
@@ -72,7 +72,7 @@
 };
 
 #ifndef MAEMO_CHANGES
-#define TOGGLE_WIDTH 12
+#define TOGGLE_WIDTH 13
 #else  /* MAEMO_CHANGES */
 #define TOGGLE_WIDTH 26
 #endif /* MAEMO_CHANGES */
@@ -375,7 +375,7 @@
                         expose_area, widget, "cellradio",
                         cell_area->x + x_offset + cell->xpad,
                         cell_area->y + y_offset + cell->ypad,
-                        width - 1, height - 1);
+                        width, height);
     }
   else
     {
@@ -385,7 +385,7 @@
                        expose_area, widget, "cellcheck",
                        cell_area->x + x_offset + cell->xpad,
                        cell_area->y + y_offset + cell->ypad,
-                       width - 1, height - 1);
+                       width, height);
     }
 }
 

Modified: projects/haf/trunk/gtk+/gtk/gtkcheckmenuitem.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkcheckmenuitem.c	2007-07-27 12:19:27 UTC (rev 12876)
+++ projects/haf/trunk/gtk+/gtk/gtkcheckmenuitem.c	2007-07-27 12:37:22 UTC (rev 12877)
@@ -112,7 +112,7 @@
                                                              P_("Size of check or radio indicator"),
                                                              0,
                                                              G_MAXINT,
-                                                             12,
+                                                             13,
                                                              GTK_PARAM_READABLE));
 
   widget_class->expose_event = gtk_check_menu_item_expose;

Modified: projects/haf/trunk/gtk+/gtk/gtkstyle.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkstyle.c	2007-07-27 12:19:27 UTC (rev 12876)
+++ projects/haf/trunk/gtk+/gtk/gtkstyle.c	2007-07-27 12:37:22 UTC (rev 12877)
@@ -3644,7 +3644,7 @@
   
   exterior_size = MIN (width, height);
   if (exterior_size % 2 == 0) /* Ensure odd */
-    exterior_size -= -1;
+    exterior_size -= 1;
 
   pad = style->xthickness + MAX (1, (exterior_size - 2 * style->xthickness) / 9);
   interior_size = MAX (1, exterior_size - 2 * pad);
@@ -3767,7 +3767,7 @@
   
   exterior_size = MIN (width, height);
   if (exterior_size % 2 == 0) /* Ensure odd */
-    exterior_size -= -1;
+    exterior_size -= 1;
   
   x -= (1 + exterior_size - width) / 2;
   y -= (1 + exterior_size - height) / 2;