Truncate labels in the splash screen if they are too long to be displayed

without resizing the window; this should fix the problems with 100dpi fonts.


--Sven
This commit is contained in:
Sven Neumann 1998-04-19 12:19:24 +00:00
parent 41aa51ff31
commit f73afe16f1
3 changed files with 27 additions and 3 deletions

View file

@ -1,3 +1,9 @@
Sun Apr 19 14:16:44 MEST 1998 Sven Neumann <sven@gimp.org>
* app/app_procs.c: truncate labels in the splash screen if they
are too long to be displayed without resizing the window; this
should fix the problems with 100dpi fonts
Sat Apr 18 22:19:10 PDT 1998 Manish Singh <yosh@gimp.org>
* app/gimprc.c: don't dereference NULL pointer when a gimprc

View file

@ -142,6 +142,7 @@ static int logo_height = 0;
static int logo_area_width = 0;
static int logo_area_height = 0;
static int show_logo = SHOW_NEVER;
static int max_label_length = MAXPATHLEN;
static int
splash_logo_load_size (GtkWidget *window)
@ -276,6 +277,12 @@ splash_text_draw (GtkWidget *widget)
((logo_area_width - gdk_string_width (font, AUTHORS)) / 2),
(0.80 * logo_area_height),
AUTHORS);
/*
* This is a hack: we try to compute a good guess for the maximum number
* of charcters that will fit into the splash-screen using the given font
*/
max_label_length = (float)strlen (AUTHORS) *
( (float)logo_area_width / (float)gdk_string_width (font, AUTHORS) );
}
static void
@ -396,6 +403,8 @@ app_init_update_status(char *label1val,
char *label2val,
float pct_progress)
{
char *temp;
if(no_interface == FALSE && no_splash == FALSE && win_initstatus)
{
GdkRectangle area = {0, 0, -1, -1};
@ -407,6 +416,14 @@ app_init_update_status(char *label1val,
if(label2val
&& strcmp(label2val, GTK_LABEL(label2)->label))
{
while ( strlen (label2val) > max_label_length )
{
temp = strchr (label2val, '/');
if (temp == NULL) /* for sanity */
break;
temp++;
label2val = temp;
}
gtk_label_set(GTK_LABEL(label2), label2val);
}
if(pct_progress >= 0

View file

@ -87,9 +87,10 @@ Click and drag on a ruler to place a Guide on an image. All
dragged selections will snap to the guides. You can remove
guides by dragging them off the image with the Move tool.
GIMP supports gzip compression on the fly. Just add .gz (or .bz2,
if you habe bzip2 installed) to the filename and your image will be
saved compressed. Of course loading compressed images works too.
The GIMP supports gzip compression on the fly. Just add
'.gz' (or '.bz2', if you habe bzip2 installed) to the filename
and your image will be saved compressed. Of course loading
compressed images works too.
Pressing and holding the Shift key before making a selection allows
you to add to the current selection instead of replacing it. Using