[gtk+] Fixed possible devision by zero in size negotiations
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Fixed possible devision by zero in size negotiations
- Date: Mon, 29 Mar 2010 17:30:15 +0000 (UTC)
commit b4d09fd5fb5491bfeda98fd5767206c503a5ee18
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Mon Mar 29 13:27:40 2010 -0400
Fixed possible devision by zero in size negotiations
Fixed GtkToolItemGroup to avoid deviding by zero when all children
are invisible or there are no children. bgo #613974.
gtk/gtktoolitemgroup.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtktoolitemgroup.c b/gtk/gtktoolitemgroup.c
index a3d75b7..0107b0f 100644
--- a/gtk/gtktoolitemgroup.c
+++ b/gtk/gtktoolitemgroup.c
@@ -631,6 +631,9 @@ gtk_tool_item_group_real_size_query (GtkWidget *widget,
else
item_size.height = MIN (item_size.height, allocation->height);
+ item_size.width = MAX (item_size.width, 1);
+ item_size.height = MAX (item_size.height, 1);
+
item_area.width = 0;
item_area.height = 0;
@@ -903,6 +906,9 @@ gtk_tool_item_group_real_size_allocate (GtkWidget *widget,
/* figure out the size of homogeneous items */
gtk_tool_item_group_get_item_size (group, &item_size, TRUE, &min_rows);
+ item_size.width = MAX (item_size.width, 1);
+ item_size.height = MAX (item_size.height, 1);
+
/* figure out the available columns and size of item_area */
if (GTK_ORIENTATION_VERTICAL == orientation)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]