From 9a80100e9ab2430ecc4375ba6bd2f66784ce34a9 Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Thu, 6 Jan 2011 02:29:18 +0900 Subject: Fixed get_size() for GtkCellRendererText to clip to the input area For ellipsize cells it's important to clip the result of get_size() so that the returned required rectangle is indeed less than or equal to the input rectangle... this is done so that GtkCellArea can accurately paint focus on cells by calling gtk_cell_renderer_get_aligned_area(). Patch also adds assertions to gtk_cell_renderer_get_aligned_area() to ensure this keeps working correctly. --- gtk/gtkcellrenderer.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gtk/gtkcellrenderer.c') diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c index a6760ee1ac..b2ef07b4a5 100644 --- a/gtk/gtkcellrenderer.c +++ b/gtk/gtkcellrenderer.c @@ -1657,4 +1657,9 @@ gtk_cell_renderer_get_aligned_area (GtkCellRenderer *cell, klass = GTK_CELL_RENDERER_GET_CLASS (cell); klass->get_aligned_area (cell, widget, flags, cell_area, aligned_area); + + g_assert (aligned_area->x >= cell_area->x && aligned_area->x < cell_area->x + cell_area->width); + g_assert (aligned_area->y >= cell_area->y && aligned_area->y < cell_area->y + cell_area->height); + g_assert ((aligned_area->x - cell_area->x) + aligned_area->width <= cell_area->width); + g_assert ((aligned_area->y - cell_area->y) + aligned_area->height <= cell_area->height); } -- cgit v1.2.1