From 4c39ac333702627a5428ab70da091958c4f8aa4a Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 14 Dec 2002 18:44:52 +0000 Subject: [PATCH] renamed paramater "update_popup" to "popup_only" because it's less 2002-12-14 Michael Natterer * app/display/gimpdisplayshell.[ch] (gimp_display_shell_set_menu_sensitivity): renamed paramater "update_popup" to "popup_only" because it's less confusing. Fixed the function to update the popup correctly for shell = NULL. --- ChangeLog | 7 +++++++ app/display/gimpdisplayshell-draw.c | 27 +++++++++++++++++---------- app/display/gimpdisplayshell-draw.h | 2 +- app/display/gimpdisplayshell.c | 27 +++++++++++++++++---------- app/display/gimpdisplayshell.h | 2 +- 5 files changed, 43 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index aed3d91a9e..b9052e7a7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-12-14 Michael Natterer + + * app/display/gimpdisplayshell.[ch] + (gimp_display_shell_set_menu_sensitivity): renamed paramater + "update_popup" to "popup_only" because it's less confusing. Fixed + the function to update the popup correctly for shell = NULL. + 2002-12-14 Michael Natterer * app/gui/plug-in-commands.c (plug_in_repeat_cmd_callback): diff --git a/app/display/gimpdisplayshell-draw.c b/app/display/gimpdisplayshell-draw.c index 7b92d6293a..c2c7151347 100644 --- a/app/display/gimpdisplayshell-draw.c +++ b/app/display/gimpdisplayshell-draw.c @@ -1066,7 +1066,7 @@ gimp_display_shell_untransform_xy_f (GimpDisplayShell *shell, void gimp_display_shell_set_menu_sensitivity (GimpDisplayShell *shell, Gimp *gimp, - gboolean update_popup) + gboolean popup_only) { GtkItemFactory *item_factory = NULL; GimpDisplay *gdisp = NULL; @@ -1088,19 +1088,20 @@ gimp_display_shell_set_menu_sensitivity (GimpDisplayShell *shell, gint lind = -1; gint lnum = -1; - g_return_if_fail (! shell || GIMP_IS_DISPLAY_SHELL (shell)); + g_return_if_fail (shell == NULL || GIMP_IS_DISPLAY_SHELL (shell)); + g_return_if_fail (popup_only == TRUE || GIMP_IS_DISPLAY_SHELL (shell)); g_return_if_fail (GIMP_IS_GIMP (gimp)); if (shell) { gdisp = shell->gdisp; - if (update_popup) + if (popup_only) item_factory = GTK_ITEM_FACTORY (shell->popup_factory); else item_factory = GTK_ITEM_FACTORY (shell->menubar_factory); } - else if (update_popup) + else if (popup_only) { item_factory = GTK_ITEM_FACTORY (gimp_item_factory_from_path ("")); } @@ -1330,16 +1331,22 @@ gimp_display_shell_set_menu_sensitivity (GimpDisplayShell *shell, plug_in_set_menu_sensitivity (GIMP_ITEM_FACTORY (item_factory), type); - /* update the popup menu if this is the active display */ - if (shell && ! update_popup) + /* update the popup menu */ + if (! popup_only) { GimpContext *user_context; - user_context = gimp_get_user_context (gdisp->gimage->gimp); + user_context = gimp_get_user_context (gimp); - if (gimp_context_get_display (user_context) == gdisp) + if (shell) { - gimp_display_shell_set_menu_sensitivity (shell, gdisp->gimage->gimp, + if (gimp_context_get_display (user_context) == gdisp) + gimp_display_shell_set_menu_sensitivity (shell, gdisp->gimage->gimp, + TRUE); + } + else + { + gimp_display_shell_set_menu_sensitivity (NULL, gdisp->gimage->gimp, TRUE); } } @@ -1852,7 +1859,7 @@ gimp_display_shell_set_padding (GimpDisplayShell *shell, else { shell->padding_color = *padding_color; - } + } break; case GIMP_DISPLAY_PADDING_MODE_LIGHT_CHECK: diff --git a/app/display/gimpdisplayshell-draw.h b/app/display/gimpdisplayshell-draw.h index 2bfa91d89d..ecf6414769 100644 --- a/app/display/gimpdisplayshell-draw.h +++ b/app/display/gimpdisplayshell-draw.h @@ -209,7 +209,7 @@ void gimp_display_shell_untransform_xy_f (GimpDisplayShell *shell, void gimp_display_shell_set_menu_sensitivity (GimpDisplayShell *shell, Gimp *gimp, - gboolean update_popup); + gboolean popup_only); GimpGuide * gimp_display_shell_find_guide (GimpDisplayShell *shell, gdouble x, diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c index 7b92d6293a..c2c7151347 100644 --- a/app/display/gimpdisplayshell.c +++ b/app/display/gimpdisplayshell.c @@ -1066,7 +1066,7 @@ gimp_display_shell_untransform_xy_f (GimpDisplayShell *shell, void gimp_display_shell_set_menu_sensitivity (GimpDisplayShell *shell, Gimp *gimp, - gboolean update_popup) + gboolean popup_only) { GtkItemFactory *item_factory = NULL; GimpDisplay *gdisp = NULL; @@ -1088,19 +1088,20 @@ gimp_display_shell_set_menu_sensitivity (GimpDisplayShell *shell, gint lind = -1; gint lnum = -1; - g_return_if_fail (! shell || GIMP_IS_DISPLAY_SHELL (shell)); + g_return_if_fail (shell == NULL || GIMP_IS_DISPLAY_SHELL (shell)); + g_return_if_fail (popup_only == TRUE || GIMP_IS_DISPLAY_SHELL (shell)); g_return_if_fail (GIMP_IS_GIMP (gimp)); if (shell) { gdisp = shell->gdisp; - if (update_popup) + if (popup_only) item_factory = GTK_ITEM_FACTORY (shell->popup_factory); else item_factory = GTK_ITEM_FACTORY (shell->menubar_factory); } - else if (update_popup) + else if (popup_only) { item_factory = GTK_ITEM_FACTORY (gimp_item_factory_from_path ("")); } @@ -1330,16 +1331,22 @@ gimp_display_shell_set_menu_sensitivity (GimpDisplayShell *shell, plug_in_set_menu_sensitivity (GIMP_ITEM_FACTORY (item_factory), type); - /* update the popup menu if this is the active display */ - if (shell && ! update_popup) + /* update the popup menu */ + if (! popup_only) { GimpContext *user_context; - user_context = gimp_get_user_context (gdisp->gimage->gimp); + user_context = gimp_get_user_context (gimp); - if (gimp_context_get_display (user_context) == gdisp) + if (shell) { - gimp_display_shell_set_menu_sensitivity (shell, gdisp->gimage->gimp, + if (gimp_context_get_display (user_context) == gdisp) + gimp_display_shell_set_menu_sensitivity (shell, gdisp->gimage->gimp, + TRUE); + } + else + { + gimp_display_shell_set_menu_sensitivity (NULL, gdisp->gimage->gimp, TRUE); } } @@ -1852,7 +1859,7 @@ gimp_display_shell_set_padding (GimpDisplayShell *shell, else { shell->padding_color = *padding_color; - } + } break; case GIMP_DISPLAY_PADDING_MODE_LIGHT_CHECK: diff --git a/app/display/gimpdisplayshell.h b/app/display/gimpdisplayshell.h index 2bfa91d89d..ecf6414769 100644 --- a/app/display/gimpdisplayshell.h +++ b/app/display/gimpdisplayshell.h @@ -209,7 +209,7 @@ void gimp_display_shell_untransform_xy_f (GimpDisplayShell *shell, void gimp_display_shell_set_menu_sensitivity (GimpDisplayShell *shell, Gimp *gimp, - gboolean update_popup); + gboolean popup_only); GimpGuide * gimp_display_shell_find_guide (GimpDisplayShell *shell, gdouble x,