From fd308340d4c3ba34fa595a1b50a2ecbc1026286b Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Thu, 3 Mar 2005 00:06:28 +0000 Subject: [PATCH] libgimp/gimpdrawablecombobox.c set a width request on the combo boxes. 2005-03-03 Sven Neumann * libgimp/gimpdrawablecombobox.c * libgimp/gimpimagecombobox.c: set a width request on the combo boxes. * plug-ins/common/bumpmap.c (SCALE_WIDTH): set a minimum width on the scales. --- ChangeLog | 8 ++++++++ libgimp/gimpdrawablecombobox.c | 15 +++++++++------ libgimp/gimpimagecombobox.c | 9 +++++---- libgimp/gimpitemcombobox.c | 15 +++++++++------ plug-ins/common/bumpmap.c | 4 ++-- 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 707e0bc3a2..989ab6fbc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-03-03 Sven Neumann + + * libgimp/gimpdrawablecombobox.c + * libgimp/gimpimagecombobox.c: set a width-request on the combo boxes. + + * plug-ins/common/bumpmap.c (SCALE_WIDTH): set a minimum width on + the scales. + 2005-03-02 Manish Singh * libgimp/gimp.[ch] diff --git a/libgimp/gimpdrawablecombobox.c b/libgimp/gimpdrawablecombobox.c index 6c158e4db5..3b431b83bf 100644 --- a/libgimp/gimpdrawablecombobox.c +++ b/libgimp/gimpdrawablecombobox.c @@ -32,7 +32,8 @@ #include "gimppixbuf.h" -#define MENU_THUMBNAIL_SIZE 24 +#define THUMBNAIL_SIZE 24 +#define WIDTH_REQUEST 200 static gint gimp_drawable_combo_box_model_add (GtkListStore *store, @@ -74,7 +75,8 @@ gimp_drawable_combo_box_new (GimpDrawableConstraintFunc constraint, gint i; combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX, - "ellipsize", PANGO_ELLIPSIZE_MIDDLE, + "width-request", WIDTH_REQUEST, + "ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL); model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)); @@ -133,7 +135,8 @@ gimp_channel_combo_box_new (GimpDrawableConstraintFunc constraint, gint i; combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX, - "ellipsize", PANGO_ELLIPSIZE_MIDDLE, + "width-request", WIDTH_REQUEST, + "ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL); model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)); @@ -185,7 +188,8 @@ gimp_layer_combo_box_new (GimpDrawableConstraintFunc constraint, gint i; combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX, - "ellipsize", PANGO_ELLIPSIZE_MIDDLE, + "width-request", WIDTH_REQUEST, + "ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL); model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)); @@ -242,8 +246,7 @@ gimp_drawable_combo_box_model_add (GtkListStore *store, g_free (image_name); thumb = gimp_drawable_get_thumbnail (drawables[i], - MENU_THUMBNAIL_SIZE, - MENU_THUMBNAIL_SIZE, + THUMBNAIL_SIZE, THUMBNAIL_SIZE, GIMP_PIXBUF_SMALL_CHECKS); gtk_list_store_append (store, &iter); diff --git a/libgimp/gimpimagecombobox.c b/libgimp/gimpimagecombobox.c index 1c896a2e50..aeb01cdb10 100644 --- a/libgimp/gimpimagecombobox.c +++ b/libgimp/gimpimagecombobox.c @@ -32,7 +32,8 @@ #include "gimppixbuf.h" -#define MENU_THUMBNAIL_SIZE 24 +#define THUMBNAIL_SIZE 24 +#define WIDTH_REQUEST 200 static void gimp_image_combo_box_model_add (GtkListStore *store, @@ -72,7 +73,8 @@ gimp_image_combo_box_new (GimpImageConstraintFunc constraint, gint num_images; combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX, - "ellipsize", PANGO_ELLIPSIZE_MIDDLE, + "width-request", WIDTH_REQUEST, + "ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL); model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)); @@ -113,8 +115,7 @@ gimp_image_combo_box_model_add (GtkListStore *store, g_free (image_name); thumb = gimp_image_get_thumbnail (images[i], - MENU_THUMBNAIL_SIZE, - MENU_THUMBNAIL_SIZE, + THUMBNAIL_SIZE, THUMBNAIL_SIZE, GIMP_PIXBUF_SMALL_CHECKS); gtk_list_store_append (store, &iter); diff --git a/libgimp/gimpitemcombobox.c b/libgimp/gimpitemcombobox.c index 6c158e4db5..3b431b83bf 100644 --- a/libgimp/gimpitemcombobox.c +++ b/libgimp/gimpitemcombobox.c @@ -32,7 +32,8 @@ #include "gimppixbuf.h" -#define MENU_THUMBNAIL_SIZE 24 +#define THUMBNAIL_SIZE 24 +#define WIDTH_REQUEST 200 static gint gimp_drawable_combo_box_model_add (GtkListStore *store, @@ -74,7 +75,8 @@ gimp_drawable_combo_box_new (GimpDrawableConstraintFunc constraint, gint i; combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX, - "ellipsize", PANGO_ELLIPSIZE_MIDDLE, + "width-request", WIDTH_REQUEST, + "ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL); model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)); @@ -133,7 +135,8 @@ gimp_channel_combo_box_new (GimpDrawableConstraintFunc constraint, gint i; combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX, - "ellipsize", PANGO_ELLIPSIZE_MIDDLE, + "width-request", WIDTH_REQUEST, + "ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL); model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)); @@ -185,7 +188,8 @@ gimp_layer_combo_box_new (GimpDrawableConstraintFunc constraint, gint i; combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX, - "ellipsize", PANGO_ELLIPSIZE_MIDDLE, + "width-request", WIDTH_REQUEST, + "ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL); model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)); @@ -242,8 +246,7 @@ gimp_drawable_combo_box_model_add (GtkListStore *store, g_free (image_name); thumb = gimp_drawable_get_thumbnail (drawables[i], - MENU_THUMBNAIL_SIZE, - MENU_THUMBNAIL_SIZE, + THUMBNAIL_SIZE, THUMBNAIL_SIZE, GIMP_PIXBUF_SMALL_CHECKS); gtk_list_store_append (store, &iter); diff --git a/plug-ins/common/bumpmap.c b/plug-ins/common/bumpmap.c index 755873f0f9..a11a20715e 100644 --- a/plug-ins/common/bumpmap.c +++ b/plug-ins/common/bumpmap.c @@ -119,9 +119,9 @@ /***** Magic numbers *****/ -#define PLUG_IN_VERSION "April 2000, 3.0-pre1-ac2" +#define PLUG_IN_VERSION "April 2000, 3.0-pre1-ac2" -#define SCALE_WIDTH 0 +#define SCALE_WIDTH 100 /***** Types *****/