graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-21 20:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

improved the check if the message can be shown in the statusbar. Do not

Browse source 
2008-04-10  Sven Neumann  <sven@gimp.org>

	* app/display/gimpstatusbar.[ch] 
(gimp_statusbar_progress_message):
	improved the check if the message can be shown in the statusbar.
	Do not show messages that don't fit into the given space.

	* app/gui/gui-message.c (gui_message_error_dialog): if there's
	already an error dialog associated with a progress, then use it.


svn path=/trunk/; revision=25461
This commit is contained in:
Sven Neumann 2008-04-10 19:24:06 +00:00 committed by Sven Neumann
parent ff492c52a3
commit 5357d440e4
4 changed files with 52 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-04-10 Sven Neumann <sven@gimp.org>
* app/display/gimpstatusbar.[ch] (gimp_statusbar_progress_message):
improved the check if the message can be shown in the statusbar.
Do not show messages that don't fit into the given space.
* app/gui/gui-message.c:
2008-04-10 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpcomponenteditor.c: implement

52
app/display/gimpstatusbar.c
View file

@ -262,8 +262,8 @@ gimp_statusbar_finalize (GObject *object)
g_hash_table_destroy (statusbar->context_ids);
statusbar->context_ids = NULL;
g_free (statusbar->temp_spaces);
statusbar->temp_spaces = NULL;
g_free (statusbar->icon_spaces);
statusbar->icon_spaces = NULL;
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@ -483,17 +483,37 @@ gimp_statusbar_progress_message (GimpProgress *progress,
const gchar *domain,
const gchar *message)
{
GimpStatusbar *statusbar = GIMP_STATUSBAR (progress);
GimpStatusbar *statusbar = GIMP_STATUSBAR (progress);
PangoLayout *layout;
gboolean handle_msg = FALSE;
/* we can handle only one-liners */
if (strchr (message, '\n'))
return FALSE;
/* we can only handle short one-liners */
gimp_statusbar_push_temp (statusbar,
gimp_get_message_stock_id (severity),
"%s", message);
layout = gtk_widget_create_pango_layout (GTK_STATUSBAR (statusbar)->label,
message);
return TRUE;
if (pango_layout_get_line_count (layout) == 1)
{
gint width;
pango_layout_get_pixel_size (layout, &width, NULL);
width += statusbar->icon_width;
if (width < GTK_STATUSBAR (statusbar)->label->allocation.width)
{
handle_msg = TRUE;
}
}
g_object_unref (layout);
if (handle_msg)
gimp_statusbar_push_temp (statusbar,
gimp_get_message_stock_id (severity),
"%s", message);
return handle_msg;
}
static void
@ -538,7 +558,7 @@ gimp_statusbar_update (GimpStatusbar *statusbar)
if (text && statusbar->temp_timeout_id)
{
gchar *temp = g_strconcat (statusbar->temp_spaces, text, NULL);
gchar *temp = g_strconcat (statusbar->icon_spaces, text, NULL);
gimp_statusbar_set_text (statusbar, temp);
g_free (temp);
@ -1108,15 +1128,17 @@ gimp_statusbar_label_style_set (GtkWidget *widget,
{
n_spaces++;
statusbar->temp_spaces = g_realloc (statusbar->temp_spaces, n_spaces + 1);
statusbar->icon_spaces = g_realloc (statusbar->icon_spaces, n_spaces + 1);
memset (statusbar->temp_spaces, ' ', n_spaces);
statusbar->temp_spaces[n_spaces] = '\0';
memset (statusbar->icon_spaces, ' ', n_spaces);
statusbar->icon_spaces[n_spaces] = '\0';
pango_layout_set_text (layout, statusbar->temp_spaces, -1);
pango_layout_set_text (layout, statusbar->icon_spaces, -1);
pango_layout_get_pixel_size (layout, &layout_width, NULL);
}
statusbar->icon_width = layout_width;
g_object_unref (layout);
g_object_unref (pixbuf);
}

3
app/display/gimpstatusbar.h
View file

@ -48,7 +48,8 @@ struct _GimpStatusbar
guint temp_context_id;
guint temp_timeout_id;
gchar *temp_spaces;
gint icon_width;
gchar *icon_spaces;
gchar cursor_format_str[CURSOR_FORMAT_LENGTH];
gchar length_format_str[CURSOR_FORMAT_LENGTH];

6
app/gui/gui-message.c
View file

@ -193,7 +193,11 @@ gui_message_error_dialog (Gimp *gimp,
if (GIMP_IS_PROGRESS (handler))
{
if (gimp_progress_message (GIMP_PROGRESS (handler), gimp,
/* If there's already an error dialog associated with this
* progress, then continue without trying gimp_progress_message().
*/
if (! g_object_get_data (handler, "gimp-error-dialog") &&
gimp_progress_message (GIMP_PROGRESS (handler), gimp,
severity, domain, message))
{
return TRUE;