[gnome-font-viewer] font-widget: sync from sushi
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-font-viewer] font-widget: sync from sushi
- Date: Tue, 1 May 2012 15:59:17 +0000 (UTC)
commit 026e3784f7ce4e81a65d3b5817e2bb163fa44c0a
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Tue May 1 11:59:02 2012 -0400
font-widget: sync from sushi
src/sushi-font-widget.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/src/sushi-font-widget.c b/src/sushi-font-widget.c
index 6546385..7b7ce39 100644
--- a/src/sushi-font-widget.c
+++ b/src/sushi-font-widget.c
@@ -297,6 +297,9 @@ sushi_font_widget_size_request (GtkWidget *drawing_area,
return;
}
+ if (min_height != NULL)
+ *min_height = -1;
+
surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
SURFACE_SIZE, SURFACE_SIZE);
cr = cairo_create (surface);
@@ -364,6 +367,9 @@ sushi_font_widget_size_request (GtkWidget *drawing_area,
pixmap_height += padding.bottom + SECTION_SPACING;
+ if (min_height != NULL && *min_height == -1)
+ *min_height = pixmap_height;
+
if (width != NULL)
*width = pixmap_width;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]