dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make sure the title area is cleared when the timeout is cancelled. 

2005-12-29  Sven Neumann  <sven@gimp.org>

	* app/widgets/gimpdockable.c: make sure the title area is cleared
	when the timeout is cancelled.
This commit is contained in:
Sven Neumann 2005-12-28 23:43:53 +00:00 committed by Sven Neumann
parent 8ac30ae882
commit 6af4b9b317
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-12-29 Sven Neumann <sven@gimp.org>
* app/widgets/gimpdockable.c: make sure the title area is cleared
when the timeout is cancelled.
2005-12-28 Manish Singh <yosh@gimp.org>
* plug-ins/pygimp/pygimp-pdb.c: handle d_path -> d_vectors rename.

34
app/widgets/gimpdockable.c
View File

@ -77,6 +77,7 @@ static void gimp_dockable_forall (GtkContainer *container,
static void gimp_dockable_get_title_area (GimpDockable *dockable,
GdkRectangle *area);
static void gimp_dockable_clear_title_area (GimpDockable *dockable);
static gboolean gimp_dockable_menu_button_press (GtkWidget *button,
GdkEventButton *bevent,
@ -184,6 +185,8 @@ gimp_dockable_destroy (GtkObject *object)
{
GimpDockable *dockable = GIMP_DOCKABLE (object);
gimp_dockable_blink_cancel (dockable);
if (dockable->context)
gimp_dockable_set_context (dockable, NULL);
@ -223,9 +226,6 @@ gimp_dockable_destroy (GtkObject *object)
dockable->menu_button = NULL;
}
if (dockable->blink_timeout_id)
gimp_dockable_blink_cancel (dockable);
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
@ -827,8 +827,7 @@ gimp_dockable_blink (GimpDockable *dockable)
g_source_remove (dockable->blink_timeout_id);
dockable->blink_timeout_id =
g_timeout_add (150, (GSourceFunc) gimp_dockable_blink_timeout,
dockable);
g_timeout_add (150, (GSourceFunc) gimp_dockable_blink_timeout, dockable);
gimp_dockable_blink_timeout (dockable);
}
@ -841,8 +840,11 @@ gimp_dockable_blink_cancel (GimpDockable *dockable)
if (dockable->blink_timeout_id)
{
g_source_remove (dockable->blink_timeout_id);
dockable->blink_timeout_id = 0;
dockable->blink_counter = 0;
gimp_dockable_clear_title_area (dockable);
}
}
@ -865,6 +867,19 @@ gimp_dockable_get_title_area (GimpDockable *dockable,
area->x += dockable->menu_button->allocation.width;
}
static void
gimp_dockable_clear_title_area (GimpDockable *dockable)
{
if (GTK_WIDGET_DRAWABLE (dockable))
{
GdkRectangle area;
gimp_dockable_get_title_area (dockable, &area);
gtk_widget_queue_draw_area (GTK_WIDGET (dockable),
area.x, area.y, area.width, area.height);
}
}
static gboolean
gimp_dockable_menu_button_press (GtkWidget *button,
GdkEventButton *bevent,
@ -1019,14 +1034,7 @@ gimp_dockable_show_menu (GimpDockable *dockable)
static gboolean
gimp_dockable_blink_timeout (GimpDockable *dockable)
{
if (GTK_WIDGET_DRAWABLE (dockable))
{
GdkRectangle area;
gimp_dockable_get_title_area (dockable, &area);
gtk_widget_queue_draw_area (GTK_WIDGET (dockable),
area.x, area.y, area.width, area.height);
}
gimp_dockable_clear_title_area (dockable);
if (dockable->blink_counter++ > 3)
{