[gtk+] Fixed generic height-for-width implementation of GtkBin to consider request adjustments
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Fixed generic height-for-width implementation of GtkBin to consider request adjustments
- Date: Wed, 29 Dec 2010 07:52:13 +0000 (UTC)
commit 21aef5b77fa89a0c62cb72ce16ee579d3aaec624
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Wed Dec 29 16:26:05 2010 +0900
Fixed generic height-for-width implementation of GtkBin to consider request adjustments
Since "->adjust_size_request()" was added, it became important for GtkBin's
generic height-for-width implementation to further check the requests
using this vfunc.
gtk/gtkbin.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c
index 2e2cde6..af3efea 100644
--- a/gtk/gtkbin.c
+++ b/gtk/gtkbin.c
@@ -211,7 +211,12 @@ get_child_padding_delta (GtkBin *bin,
* direct vfuncs
*/
GTK_WIDGET_GET_CLASS (bin)->get_preferred_width (GTK_WIDGET (bin), &hmin, &hnat);
+ GTK_WIDGET_GET_CLASS (bin)->adjust_size_request (GTK_WIDGET (bin),
+ GTK_ORIENTATION_HORIZONTAL, &hmin, &hnat);
+
GTK_WIDGET_GET_CLASS (bin)->get_preferred_height (GTK_WIDGET (bin), &vmin, &vnat);
+ GTK_WIDGET_GET_CLASS (bin)->adjust_size_request (GTK_WIDGET (bin),
+ GTK_ORIENTATION_VERTICAL, &vmin, &vnat);
gtk_widget_get_preferred_width (priv->child, &child_hmin, NULL);
gtk_widget_get_preferred_height (priv->child, &child_vmin, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]