[gtk+/wip/baedert/drawing: 12/63] checkmenuitem: Fix indicator allocation
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/baedert/drawing: 12/63] checkmenuitem: Fix indicator allocation
- Date: Tue, 27 Jun 2017 16:52:29 +0000 (UTC)
commit 377088150a747353f783b62bab76fd1fe7f902f3
Author: Timm Bäder <mail baedert org>
Date: Sat Jun 17 07:14:38 2017 +0200
checkmenuitem: Fix indicator allocation
base point is the menu item's content allocation now.
gtk/gtkcheckmenuitem.c | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
index e9928eb..7f1d2fd 100644
--- a/gtk/gtkcheckmenuitem.c
+++ b/gtk/gtkcheckmenuitem.c
@@ -112,7 +112,7 @@ gtk_check_menu_item_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkAllocation clip, widget_clip;
- GtkAllocation content_alloc, indicator_alloc;
+ GtkAllocation indicator_alloc;
GtkCheckMenuItem *check_menu_item = GTK_CHECK_MENU_ITEM (widget);
GtkCheckMenuItemPrivate *priv = check_menu_item->priv;
gint toggle_size;
@@ -120,8 +120,6 @@ gtk_check_menu_item_size_allocate (GtkWidget *widget,
GTK_WIDGET_CLASS (gtk_check_menu_item_parent_class)->size_allocate
(widget, allocation);
- gtk_widget_get_content_allocation (widget, &content_alloc);
-
gtk_widget_measure (priv->indicator_widget,
GTK_ORIENTATION_HORIZONTAL,
-1,
@@ -135,14 +133,12 @@ gtk_check_menu_item_size_allocate (GtkWidget *widget,
toggle_size = GTK_MENU_ITEM (check_menu_item)->priv->toggle_size;
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
- indicator_alloc.x = content_alloc.x +
- (toggle_size - indicator_alloc.width) / 2;
+ indicator_alloc.x = (toggle_size - indicator_alloc.width) / 2;
else
- indicator_alloc.x = content_alloc.x + content_alloc.width - toggle_size +
+ indicator_alloc.x = allocation->width - toggle_size +
(toggle_size - indicator_alloc.width) / 2;
- indicator_alloc.y = content_alloc.y +
- (content_alloc.height - indicator_alloc.height) / 2;
+ indicator_alloc.y = (allocation->height - indicator_alloc.height) / 2;
gtk_widget_size_allocate_with_baseline (priv->indicator_widget,
&indicator_alloc,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]