From c6f15f385f9e7f8668743f1d3803013a79e1baed Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Mon, 1 Oct 2001 05:20:43 +0000 Subject: [PATCH] Applied patch from Soeren Sandmann . Vertically Sun Sep 30 22:15:52 2001 Manish Singh * gtk/gtkcheckbutton.c (gtk_check_button_size_allocate): Applied patch from Soeren Sandmann . Vertically centers the child in relation to the to indicator height. --- ChangeLog | 16 ++++++++++++---- ChangeLog.pre-2-0 | 16 ++++++++++++---- ChangeLog.pre-2-10 | 16 ++++++++++++---- ChangeLog.pre-2-2 | 16 ++++++++++++---- ChangeLog.pre-2-4 | 16 ++++++++++++---- ChangeLog.pre-2-6 | 16 ++++++++++++---- ChangeLog.pre-2-8 | 16 ++++++++++++---- gtk/gtkcheckbutton.c | 8 +++++--- 8 files changed, 89 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index f5d11a170..f3e2c00e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,20 @@ +Sun Sep 30 22:15:52 2001 Manish Singh + + * gtk/gtkcheckbutton.c (gtk_check_button_size_allocate): Applied + patch from Soeren Sandmann . Vertically + centers the child in relation to the to indicator height. + Sun Sep 30 15:11:59 2001 Jonathan Blandford - * gtk/gtktreestore.c (gtk_tree_store_remove): Make ITERS_PERSIST correct + * gtk/gtktreestore.c (gtk_tree_store_remove): Make ITERS_PERSIST + correct Sun Sep 30 07:01:42 2001 CEST - * gtk/gtkcellrenderertext.c I reverted back to old "weight" property code using g_param_spec_int - and changed from g_value_get_enum to g_value_get_int instead. - Probadly a better way to fix the problem :-) + * gtk/gtkcellrenderertext.c: I reverted back to old "weight" + property code using g_param_spec_int and changed from + g_value_get_enum to g_value_get_int instead. Probably a better way + to fix the problem :-) Sun Sep 30 05:31:32 2001 CEST Mikael Hermansson diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index f5d11a170..f3e2c00e0 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,12 +1,20 @@ +Sun Sep 30 22:15:52 2001 Manish Singh + + * gtk/gtkcheckbutton.c (gtk_check_button_size_allocate): Applied + patch from Soeren Sandmann . Vertically + centers the child in relation to the to indicator height. + Sun Sep 30 15:11:59 2001 Jonathan Blandford - * gtk/gtktreestore.c (gtk_tree_store_remove): Make ITERS_PERSIST correct + * gtk/gtktreestore.c (gtk_tree_store_remove): Make ITERS_PERSIST + correct Sun Sep 30 07:01:42 2001 CEST - * gtk/gtkcellrenderertext.c I reverted back to old "weight" property code using g_param_spec_int - and changed from g_value_get_enum to g_value_get_int instead. - Probadly a better way to fix the problem :-) + * gtk/gtkcellrenderertext.c: I reverted back to old "weight" + property code using g_param_spec_int and changed from + g_value_get_enum to g_value_get_int instead. Probably a better way + to fix the problem :-) Sun Sep 30 05:31:32 2001 CEST Mikael Hermansson diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f5d11a170..f3e2c00e0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,12 +1,20 @@ +Sun Sep 30 22:15:52 2001 Manish Singh + + * gtk/gtkcheckbutton.c (gtk_check_button_size_allocate): Applied + patch from Soeren Sandmann . Vertically + centers the child in relation to the to indicator height. + Sun Sep 30 15:11:59 2001 Jonathan Blandford - * gtk/gtktreestore.c (gtk_tree_store_remove): Make ITERS_PERSIST correct + * gtk/gtktreestore.c (gtk_tree_store_remove): Make ITERS_PERSIST + correct Sun Sep 30 07:01:42 2001 CEST - * gtk/gtkcellrenderertext.c I reverted back to old "weight" property code using g_param_spec_int - and changed from g_value_get_enum to g_value_get_int instead. - Probadly a better way to fix the problem :-) + * gtk/gtkcellrenderertext.c: I reverted back to old "weight" + property code using g_param_spec_int and changed from + g_value_get_enum to g_value_get_int instead. Probably a better way + to fix the problem :-) Sun Sep 30 05:31:32 2001 CEST Mikael Hermansson diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f5d11a170..f3e2c00e0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,12 +1,20 @@ +Sun Sep 30 22:15:52 2001 Manish Singh + + * gtk/gtkcheckbutton.c (gtk_check_button_size_allocate): Applied + patch from Soeren Sandmann . Vertically + centers the child in relation to the to indicator height. + Sun Sep 30 15:11:59 2001 Jonathan Blandford - * gtk/gtktreestore.c (gtk_tree_store_remove): Make ITERS_PERSIST correct + * gtk/gtktreestore.c (gtk_tree_store_remove): Make ITERS_PERSIST + correct Sun Sep 30 07:01:42 2001 CEST - * gtk/gtkcellrenderertext.c I reverted back to old "weight" property code using g_param_spec_int - and changed from g_value_get_enum to g_value_get_int instead. - Probadly a better way to fix the problem :-) + * gtk/gtkcellrenderertext.c: I reverted back to old "weight" + property code using g_param_spec_int and changed from + g_value_get_enum to g_value_get_int instead. Probably a better way + to fix the problem :-) Sun Sep 30 05:31:32 2001 CEST Mikael Hermansson diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f5d11a170..f3e2c00e0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,12 +1,20 @@ +Sun Sep 30 22:15:52 2001 Manish Singh + + * gtk/gtkcheckbutton.c (gtk_check_button_size_allocate): Applied + patch from Soeren Sandmann . Vertically + centers the child in relation to the to indicator height. + Sun Sep 30 15:11:59 2001 Jonathan Blandford - * gtk/gtktreestore.c (gtk_tree_store_remove): Make ITERS_PERSIST correct + * gtk/gtktreestore.c (gtk_tree_store_remove): Make ITERS_PERSIST + correct Sun Sep 30 07:01:42 2001 CEST - * gtk/gtkcellrenderertext.c I reverted back to old "weight" property code using g_param_spec_int - and changed from g_value_get_enum to g_value_get_int instead. - Probadly a better way to fix the problem :-) + * gtk/gtkcellrenderertext.c: I reverted back to old "weight" + property code using g_param_spec_int and changed from + g_value_get_enum to g_value_get_int instead. Probably a better way + to fix the problem :-) Sun Sep 30 05:31:32 2001 CEST Mikael Hermansson diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f5d11a170..f3e2c00e0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,12 +1,20 @@ +Sun Sep 30 22:15:52 2001 Manish Singh + + * gtk/gtkcheckbutton.c (gtk_check_button_size_allocate): Applied + patch from Soeren Sandmann . Vertically + centers the child in relation to the to indicator height. + Sun Sep 30 15:11:59 2001 Jonathan Blandford - * gtk/gtktreestore.c (gtk_tree_store_remove): Make ITERS_PERSIST correct + * gtk/gtktreestore.c (gtk_tree_store_remove): Make ITERS_PERSIST + correct Sun Sep 30 07:01:42 2001 CEST - * gtk/gtkcellrenderertext.c I reverted back to old "weight" property code using g_param_spec_int - and changed from g_value_get_enum to g_value_get_int instead. - Probadly a better way to fix the problem :-) + * gtk/gtkcellrenderertext.c: I reverted back to old "weight" + property code using g_param_spec_int and changed from + g_value_get_enum to g_value_get_int instead. Probably a better way + to fix the problem :-) Sun Sep 30 05:31:32 2001 CEST Mikael Hermansson diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f5d11a170..f3e2c00e0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,12 +1,20 @@ +Sun Sep 30 22:15:52 2001 Manish Singh + + * gtk/gtkcheckbutton.c (gtk_check_button_size_allocate): Applied + patch from Soeren Sandmann . Vertically + centers the child in relation to the to indicator height. + Sun Sep 30 15:11:59 2001 Jonathan Blandford - * gtk/gtktreestore.c (gtk_tree_store_remove): Make ITERS_PERSIST correct + * gtk/gtktreestore.c (gtk_tree_store_remove): Make ITERS_PERSIST + correct Sun Sep 30 07:01:42 2001 CEST - * gtk/gtkcellrenderertext.c I reverted back to old "weight" property code using g_param_spec_int - and changed from g_value_get_enum to g_value_get_int instead. - Probadly a better way to fix the problem :-) + * gtk/gtkcellrenderertext.c: I reverted back to old "weight" + property code using g_param_spec_int and changed from + g_value_get_enum to g_value_get_int instead. Probably a better way + to fix the problem :-) Sun Sep 30 05:31:32 2001 CEST Mikael Hermansson diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c index d57487702..8616180a5 100644 --- a/gtk/gtkcheckbutton.c +++ b/gtk/gtkcheckbutton.c @@ -283,14 +283,16 @@ gtk_check_button_size_allocate (GtkWidget *widget, { gint border_width = GTK_CONTAINER (widget)->border_width; - child_allocation.x = (border_width + indicator_size + indicator_spacing * 3 + 1 + - widget->allocation.x); - child_allocation.y = border_width + 1 + widget->allocation.y; child_allocation.width = MIN (GTK_BIN (button)->child->requisition.width, allocation->width - ((border_width + 1) * 2 + indicator_size + indicator_spacing * 3)); child_allocation.height = MIN (GTK_BIN (button)->child->requisition.height, allocation->height - (border_width + 1) * 2); + child_allocation.x = (border_width + indicator_size + indicator_spacing * 3 + 1 + + widget->allocation.x); + child_allocation.y = widget->allocation.y + + (allocation->height - child_allocation.height) / 2; + if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) child_allocation.x = allocation->x + allocation->width -- 2.43.2