[gtk+/wip/cosimoc/menuitem-gadget: 1/7] menuitem: really ignore horizontal-padding
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/cosimoc/menuitem-gadget: 1/7] menuitem: really ignore horizontal-padding
- Date: Fri, 18 Dec 2015 05:58:05 +0000 (UTC)
commit 3bea4edbc5a5cfd2ba1c0fda6579ae3d4a9ec710
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Thu Dec 17 17:46:31 2015 -0800
menuitem: really ignore horizontal-padding
This style property has been documented as been ignored for a long time,
but we were still reading it in some cases.
gtk/deprecated/gtkimagemenuitem.c | 11 +++++------
gtk/gtkcheckmenuitem.c | 6 ++----
2 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/gtk/deprecated/gtkimagemenuitem.c b/gtk/deprecated/gtkimagemenuitem.c
index 99f7a6c..011df76 100644
--- a/gtk/deprecated/gtkimagemenuitem.c
+++ b/gtk/deprecated/gtkimagemenuitem.c
@@ -645,12 +645,11 @@ gtk_image_menu_item_size_allocate (GtkWidget *widget,
GtkBorder padding;
GtkRequisition child_requisition;
GtkAllocation child_allocation;
- guint horizontal_padding, toggle_spacing;
+ guint toggle_spacing;
gint toggle_size;
toggle_size = GTK_MENU_ITEM (image_menu_item)->priv->toggle_size;
gtk_widget_style_get (widget,
- "horizontal-padding", &horizontal_padding,
"toggle-spacing", &toggle_spacing,
NULL);
@@ -672,10 +671,10 @@ gtk_image_menu_item_size_allocate (GtkWidget *widget,
{
if ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) ==
(pack_dir == GTK_PACK_DIRECTION_LTR))
- x = offset + horizontal_padding + padding.left +
+ x = offset + padding.left +
(toggle_size - toggle_spacing - child_requisition.width) / 2;
else
- x = widget_allocation.width - offset - horizontal_padding - padding.right -
+ x = widget_allocation.width - offset - padding.right -
toggle_size + toggle_spacing +
(toggle_size - toggle_spacing - child_requisition.width) / 2;
@@ -685,10 +684,10 @@ gtk_image_menu_item_size_allocate (GtkWidget *widget,
{
if ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) ==
(pack_dir == GTK_PACK_DIRECTION_TTB))
- y = offset + horizontal_padding + padding.top +
+ y = offset + padding.top +
(toggle_size - toggle_spacing - child_requisition.height) / 2;
else
- y = widget_allocation.height - offset - horizontal_padding - padding.bottom -
+ y = widget_allocation.height - offset - padding.bottom -
toggle_size + toggle_spacing +
(toggle_size - toggle_spacing - child_requisition.height) / 2;
diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
index aaf8304..b14e35c 100644
--- a/gtk/gtkcheckmenuitem.c
+++ b/gtk/gtkcheckmenuitem.c
@@ -649,7 +649,6 @@ gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
guint offset;
guint toggle_size;
guint toggle_spacing;
- guint horizontal_padding;
guint indicator_size;
GtkStateFlags state;
GtkBorder padding;
@@ -662,7 +661,6 @@ gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
gtk_widget_style_get (widget,
"toggle-spacing", &toggle_spacing,
- "horizontal-padding", &horizontal_padding,
"indicator-size", &indicator_size,
NULL);
@@ -672,13 +670,13 @@ gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
{
- x = offset + horizontal_padding +
+ x = offset +
(toggle_size - toggle_spacing - indicator_size) / 2;
}
else
{
x = allocation.width -
- offset - horizontal_padding - toggle_size + toggle_spacing +
+ offset - toggle_size + toggle_spacing +
(toggle_size - toggle_spacing - indicator_size) / 2;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]