callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied patch from Ulf-D. Ehlert that fixes disappearing buttons (bug

Browse Source 
2007-07-05  Sven Neumann  <sven@gimp.org>

	* plug-ins/common/displace.c: applied patch from Ulf-D. Ehlert
	that fixes disappearing buttons (bug #454011).

svn path=/trunk/; revision=22880
This commit is contained in:
Sven Neumann
2007-07-05 17:44:37 +00:00
committed by Sven Neumann
parent e6fc9f44c9
commit 52e636eed9
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-07-05 Sven Neumann <sven@gimp.org>
* plug-ins/common/displace.c: applied patch from Ulf-D. Ehlert
that fixes disappearing buttons (bug #454011).
2007-07-05 Raphaël Quinet <raphael@gimp.org> 2007-07-05 Raphaël Quinet <raphael@gimp.org>
* plug-ins/common/psp.c: finished error handling cleanup. * plug-ins/common/psp.c: finished error handling cleanup.

35
plug-ins/common/displace.c
View File

@ -100,7 +100,7 @@ static void displace_radio_update (GtkWidget *widget,
gpointer data); gpointer data);
static void displace_set_labels (void); static void displace_set_labels (void);
static void displace_get_label_size (void); static gint displace_get_label_size (void);
static gboolean displace_map_constrain (gint32 image_id, static gboolean displace_map_constrain (gint32 image_id,
gint32 drawable_id, gint32 drawable_id,
@ -138,7 +138,6 @@ static DisplaceVals dvals =
static GtkWidget *preview = NULL; static GtkWidget *preview = NULL;
static GtkWidget *toggle_x = NULL; static GtkWidget *toggle_x = NULL;
static GtkWidget *toggle_y = NULL; static GtkWidget *toggle_y = NULL;
static gint label_maxwidth = 0;
static const gchar *mtext[][2] = static const gchar *mtext[][2] =
{ {
@ -492,7 +491,6 @@ displace_dialog (GimpDrawable *drawable)
g_signal_connect_swapped (black, "toggled", g_signal_connect_swapped (black, "toggled",
G_CALLBACK (gimp_preview_invalidate), G_CALLBACK (gimp_preview_invalidate),
preview); preview);
displace_get_label_size ();
displace_set_labels (); displace_set_labels ();
gtk_widget_show (table); gtk_widget_show (table);
@ -823,31 +821,36 @@ displace_radio_update (GtkWidget *widget,
static void static void
displace_set_labels (void) displace_set_labels (void)
{ {
/* get the max. possible size of both check-buttons */
gint label_maxwidth = displace_get_label_size();
gtk_button_set_label (GTK_BUTTON (toggle_x), gtk_button_set_label (GTK_BUTTON (toggle_x),
gettext (mtext[0][dvals.mode])); gettext (mtext[0][dvals.mode]));
gtk_button_set_label (GTK_BUTTON (toggle_y), gtk_button_set_label (GTK_BUTTON (toggle_y),
gettext (mtext[1][dvals.mode])); gettext (mtext[1][dvals.mode]));
/* "displace_get_label_size()" must be called before */
gtk_widget_set_size_request (toggle_x, label_maxwidth, -1); gtk_widget_set_size_request (toggle_x, label_maxwidth, -1);
gtk_widget_set_size_request (toggle_y, label_maxwidth, -1); gtk_widget_set_size_request (toggle_y, label_maxwidth, -1);
} }
static void static gint
displace_get_label_size (void) displace_get_label_size (void)
{ {
gint i, j; static gint label_maxwidth = 0;
gint i, j;
label_maxwidth = 0; if (!label_maxwidth)
for (i = 0; i < 2; i++)
for (j = 0; j < 2; j++)
{
GtkRequisition requisition;
for (i = 0; i < 2; i++) gtk_button_set_label (GTK_BUTTON (toggle_x), gettext (mtext[i][j]));
for (j = 0; j < 2; j++) gtk_widget_size_request (toggle_x, &requisition);
{
GtkRequisition requisition;
gtk_button_set_label (GTK_BUTTON (toggle_x), gettext (mtext[i][j])); if (requisition.width > label_maxwidth)
gtk_widget_size_request (toggle_x, &requisition); label_maxwidth = requisition.width;
}
if (requisition.width > label_maxwidth) return label_maxwidth;
label_maxwidth = requisition.width;
}
} }