[gtk+/native-layout: 52/59] Fixed cell renderer to properly export it's height-for-width implementation.



commit 103f3a6a187ce91ac27b4af13157a13959c88bb4
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Thu Jun 24 16:51:23 2010 -0400

    Fixed cell renderer to properly export it's height-for-width implementation.

 gtk/gtkcellrenderertext.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index ac4740b..c2df04b 100644
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -1935,12 +1935,9 @@ gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRendererText *renderer
 static void
 gtk_cell_renderer_text_cell_size_request_init (GtkCellSizeRequestIface *iface)
 {
-  /* Currently cell renderers do natural widths for ellipsizing text 
-   * but dont yet do height-for-width/width-for-height calculations for
-   * wordwrapping 
-   */
-  iface->get_width  = gtk_cell_renderer_text_get_width;
-  iface->get_height = gtk_cell_renderer_text_get_height;
+  iface->get_width            = gtk_cell_renderer_text_get_width;
+  iface->get_height           = gtk_cell_renderer_text_get_height;
+  iface->get_height_for_width = gtk_cell_renderer_text_get_height_for_width;
 }
 
 static void
@@ -2066,9 +2063,11 @@ gtk_cell_renderer_text_get_height (GtkCellSizeRequest *cell,
   /* Thankfully cell renderers dont rotate, so they only have to do
    * height-for-width and not the opposite. Here we have only to return
    * the height for the base minimum width of the renderer.
+   *
+   * Note this code path wont be followed by GtkTreeView which is
+   * height-for-width specifically.
    */
   gtk_cell_size_request_get_width (cell, widget, &min_width, NULL);
-
   gtk_cell_renderer_text_get_height_for_width (cell, widget, min_width,
 					       minimum_size, natural_size);
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]