Commit fd308340 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

libgimp/gimpdrawablecombobox.c set a width request on the combo boxes.

2005-03-03  Sven Neumann  <sven@gimp.org>

	* 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.
parent 92d6b927
2005-03-03 Sven Neumann <sven@gimp.org>
* 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 <yosh@gimp.org> 2005-03-02 Manish Singh <yosh@gimp.org>
* libgimp/gimp.[ch] * libgimp/gimp.[ch]
......
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
#include "gimppixbuf.h" #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, static gint gimp_drawable_combo_box_model_add (GtkListStore *store,
...@@ -74,7 +75,8 @@ gimp_drawable_combo_box_new (GimpDrawableConstraintFunc constraint, ...@@ -74,7 +75,8 @@ gimp_drawable_combo_box_new (GimpDrawableConstraintFunc constraint,
gint i; gint i;
combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX, combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX,
"ellipsize", PANGO_ELLIPSIZE_MIDDLE, "width-request", WIDTH_REQUEST,
"ellipsize", PANGO_ELLIPSIZE_MIDDLE,
NULL); NULL);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)); model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
...@@ -133,7 +135,8 @@ gimp_channel_combo_box_new (GimpDrawableConstraintFunc constraint, ...@@ -133,7 +135,8 @@ gimp_channel_combo_box_new (GimpDrawableConstraintFunc constraint,
gint i; gint i;
combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX, combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX,
"ellipsize", PANGO_ELLIPSIZE_MIDDLE, "width-request", WIDTH_REQUEST,
"ellipsize", PANGO_ELLIPSIZE_MIDDLE,
NULL); NULL);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)); model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
...@@ -185,7 +188,8 @@ gimp_layer_combo_box_new (GimpDrawableConstraintFunc constraint, ...@@ -185,7 +188,8 @@ gimp_layer_combo_box_new (GimpDrawableConstraintFunc constraint,
gint i; gint i;
combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX, combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX,
"ellipsize", PANGO_ELLIPSIZE_MIDDLE, "width-request", WIDTH_REQUEST,
"ellipsize", PANGO_ELLIPSIZE_MIDDLE,
NULL); NULL);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)); model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
...@@ -242,8 +246,7 @@ gimp_drawable_combo_box_model_add (GtkListStore *store, ...@@ -242,8 +246,7 @@ gimp_drawable_combo_box_model_add (GtkListStore *store,
g_free (image_name); g_free (image_name);
thumb = gimp_drawable_get_thumbnail (drawables[i], thumb = gimp_drawable_get_thumbnail (drawables[i],
MENU_THUMBNAIL_SIZE, THUMBNAIL_SIZE, THUMBNAIL_SIZE,
MENU_THUMBNAIL_SIZE,
GIMP_PIXBUF_SMALL_CHECKS); GIMP_PIXBUF_SMALL_CHECKS);
gtk_list_store_append (store, &iter); gtk_list_store_append (store, &iter);
......
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
#include "gimppixbuf.h" #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, static void gimp_image_combo_box_model_add (GtkListStore *store,
...@@ -72,7 +73,8 @@ gimp_image_combo_box_new (GimpImageConstraintFunc constraint, ...@@ -72,7 +73,8 @@ gimp_image_combo_box_new (GimpImageConstraintFunc constraint,
gint num_images; gint num_images;
combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX, combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX,
"ellipsize", PANGO_ELLIPSIZE_MIDDLE, "width-request", WIDTH_REQUEST,
"ellipsize", PANGO_ELLIPSIZE_MIDDLE,
NULL); NULL);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)); model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
...@@ -113,8 +115,7 @@ gimp_image_combo_box_model_add (GtkListStore *store, ...@@ -113,8 +115,7 @@ gimp_image_combo_box_model_add (GtkListStore *store,
g_free (image_name); g_free (image_name);
thumb = gimp_image_get_thumbnail (images[i], thumb = gimp_image_get_thumbnail (images[i],
MENU_THUMBNAIL_SIZE, THUMBNAIL_SIZE, THUMBNAIL_SIZE,
MENU_THUMBNAIL_SIZE,
GIMP_PIXBUF_SMALL_CHECKS); GIMP_PIXBUF_SMALL_CHECKS);
gtk_list_store_append (store, &iter); gtk_list_store_append (store, &iter);
......
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
#include "gimppixbuf.h" #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, static gint gimp_drawable_combo_box_model_add (GtkListStore *store,
...@@ -74,7 +75,8 @@ gimp_drawable_combo_box_new (GimpDrawableConstraintFunc constraint, ...@@ -74,7 +75,8 @@ gimp_drawable_combo_box_new (GimpDrawableConstraintFunc constraint,
gint i; gint i;
combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX, combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX,
"ellipsize", PANGO_ELLIPSIZE_MIDDLE, "width-request", WIDTH_REQUEST,
"ellipsize", PANGO_ELLIPSIZE_MIDDLE,
NULL); NULL);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)); model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
...@@ -133,7 +135,8 @@ gimp_channel_combo_box_new (GimpDrawableConstraintFunc constraint, ...@@ -133,7 +135,8 @@ gimp_channel_combo_box_new (GimpDrawableConstraintFunc constraint,
gint i; gint i;
combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX, combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX,
"ellipsize", PANGO_ELLIPSIZE_MIDDLE, "width-request", WIDTH_REQUEST,
"ellipsize", PANGO_ELLIPSIZE_MIDDLE,
NULL); NULL);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)); model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
...@@ -185,7 +188,8 @@ gimp_layer_combo_box_new (GimpDrawableConstraintFunc constraint, ...@@ -185,7 +188,8 @@ gimp_layer_combo_box_new (GimpDrawableConstraintFunc constraint,
gint i; gint i;
combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX, combo_box = g_object_new (GIMP_TYPE_INT_COMBO_BOX,
"ellipsize", PANGO_ELLIPSIZE_MIDDLE, "width-request", WIDTH_REQUEST,
"ellipsize", PANGO_ELLIPSIZE_MIDDLE,
NULL); NULL);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)); model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
...@@ -242,8 +246,7 @@ gimp_drawable_combo_box_model_add (GtkListStore *store, ...@@ -242,8 +246,7 @@ gimp_drawable_combo_box_model_add (GtkListStore *store,
g_free (image_name); g_free (image_name);
thumb = gimp_drawable_get_thumbnail (drawables[i], thumb = gimp_drawable_get_thumbnail (drawables[i],
MENU_THUMBNAIL_SIZE, THUMBNAIL_SIZE, THUMBNAIL_SIZE,
MENU_THUMBNAIL_SIZE,
GIMP_PIXBUF_SMALL_CHECKS); GIMP_PIXBUF_SMALL_CHECKS);
gtk_list_store_append (store, &iter); gtk_list_store_append (store, &iter);
......
...@@ -119,9 +119,9 @@ ...@@ -119,9 +119,9 @@
/***** Magic numbers *****/ /***** 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 *****/ /***** Types *****/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment