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

app/tests: Make gimp_ui_find_dock_window() more generic

Browse Source
This commit is contained in:
Martin Nordholts
2010-06-25 13:40:03 +02:00
parent 15fd08747d
commit 1c72e5e406
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/tests/test-ui.c
View File

@ -81,7 +81,7 @@ static GimpUIManager * gimp_ui_get_ui_manager (Gimp
static void gimp_ui_synthesize_delete_event (GtkWidget *widget); static void gimp_ui_synthesize_delete_event (GtkWidget *widget);
static void gimp_ui_synthesize_key_event (GtkWidget *widget, static void gimp_ui_synthesize_key_event (GtkWidget *widget,
guint keyval); guint keyval);
static GtkWidget * gimp_ui_find_dock_window (GimpDialogFactory *dialog_factory, static GtkWidget * gimp_ui_find_window (GimpDialogFactory *dialog_factory,
GimpUiTestFunc predicate); GimpUiTestFunc predicate);
static gboolean gimp_ui_not_toolbox_window (GObject *object); static gboolean gimp_ui_not_toolbox_window (GObject *object);
static gboolean gimp_ui_multicolumn_not_toolbox_window (GObject *object); static gboolean gimp_ui_multicolumn_not_toolbox_window (GObject *object);
@ -333,8 +333,8 @@ restore_recently_closed_multi_column_dock (GimpTestFixture *fixture,
GList *session_infos = NULL; GList *session_infos = NULL;
/* Find a non-toolbox dock window */ /* Find a non-toolbox dock window */
dock_window = gimp_ui_find_dock_window (gimp_dialog_factory_get_singleton (), dock_window = gimp_ui_find_window (gimp_dialog_factory_get_singleton (),
gimp_ui_multicolumn_not_toolbox_window); gimp_ui_multicolumn_not_toolbox_window);
g_assert (dock_window != NULL); g_assert (dock_window != NULL);
/* Count number of docks */ /* Count number of docks */
@ -392,8 +392,8 @@ tab_toggle_dont_change_dock_window_position (GimpTestFixture *fixture,
gint h_after_show = -1; gint h_after_show = -1;
/* Find a non-toolbox dock window */ /* Find a non-toolbox dock window */
dock_window = gimp_ui_find_dock_window (gimp_dialog_factory_get_singleton (), dock_window = gimp_ui_find_window (gimp_dialog_factory_get_singleton (),
gimp_ui_not_toolbox_window); gimp_ui_not_toolbox_window);
g_assert (dock_window != NULL); g_assert (dock_window != NULL);
g_assert (gtk_widget_get_visible (dock_window)); g_assert (gtk_widget_get_visible (dock_window));
@ -592,8 +592,8 @@ gimp_ui_synthesize_key_event (GtkWidget *widget,
} }
static GtkWidget * static GtkWidget *
gimp_ui_find_dock_window (GimpDialogFactory *dialog_factory, gimp_ui_find_window (GimpDialogFactory *dialog_factory,
GimpUiTestFunc predicate) GimpUiTestFunc predicate)
{ {
GList *iter = NULL; GList *iter = NULL;
GtkWidget *dock_window = NULL; GtkWidget *dock_window = NULL;
@ -606,8 +606,7 @@ gimp_ui_find_dock_window (GimpDialogFactory *dialog_factory,
{ {
GtkWidget *widget = gimp_session_info_get_widget (iter->data); GtkWidget *widget = gimp_session_info_get_widget (iter->data);
if (GIMP_IS_DOCK_WINDOW (widget) && if (predicate (G_OBJECT (widget)))
predicate (G_OBJECT (widget)))
{ {
dock_window = widget; dock_window = widget;
break; break;
@ -620,7 +619,8 @@ gimp_ui_find_dock_window (GimpDialogFactory *dialog_factory,
static gboolean static gboolean
gimp_ui_not_toolbox_window (GObject *object) gimp_ui_not_toolbox_window (GObject *object)
{ {
return ! gimp_dock_window_has_toolbox (GIMP_DOCK_WINDOW (object)); return (GIMP_IS_DOCK_WINDOW (object) &&
! gimp_dock_window_has_toolbox (GIMP_DOCK_WINDOW (object)));
} }
static gboolean static gboolean
@ -628,6 +628,11 @@ gimp_ui_multicolumn_not_toolbox_window (GObject *object)
{ {
GimpDockWindow *dock_window = GIMP_DOCK_WINDOW (object); GimpDockWindow *dock_window = GIMP_DOCK_WINDOW (object);
if (! GIMP_IS_DOCK_WINDOW (object))
return FALSE;
dock_window = GIMP_DOCK_WINDOW (object);
return (! gimp_dock_window_has_toolbox (dock_window) && return (! gimp_dock_window_has_toolbox (dock_window) &&
g_list_length (gimp_dock_window_get_docks (dock_window)) > 1); g_list_length (gimp_dock_window_get_docks (dock_window)) > 1);
} }