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

app: remove the "filters_dialog" member from GimpDisplayShell 

and attach the dialog using dialogs_attach_dialog().
This commit is contained in:
Michael Natterer 2016-09-25 01:06:13 +02:00
parent 8ab530ffc0
commit c5957f146b
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/actions/view-commands.c
View File

@ -472,18 +472,21 @@ view_display_filters_cmd_callback (GtkAction *action,
gpointer data) gpointer data)
{ {
GimpDisplayShell *shell; GimpDisplayShell *shell;
GtkWidget *dialog;
return_if_no_shell (shell, data); return_if_no_shell (shell, data);
if (! shell->filters_dialog) #define FILTERS_DIALOG_KEY "gimp-display-filters-dialog"
{
shell->filters_dialog = gimp_display_shell_filter_dialog_new (shell);
g_signal_connect (shell->filters_dialog, "destroy", dialog = dialogs_get_dialog (G_OBJECT (shell), FILTERS_DIALOG_KEY);
G_CALLBACK (gtk_widget_destroyed),
&shell->filters_dialog); if (! dialog)
{
dialog = gimp_display_shell_filter_dialog_new (shell);
dialogs_attach_dialog (G_OBJECT (shell), FILTERS_DIALOG_KEY, dialog);
} }
gtk_window_present (GTK_WINDOW (shell->filters_dialog)); gtk_window_present (GTK_WINDOW (dialog));
} }
void void

1
app/display/gimpdisplayshell.h
View File

@ -159,7 +159,6 @@ struct _GimpDisplayShell
GimpColorDisplayStack *filter_stack; /* color display conversion stuff */ GimpColorDisplayStack *filter_stack; /* color display conversion stuff */
guint filter_idle_id; guint filter_idle_id;
GtkWidget *filters_dialog; /* color display filter dialog */
const Babl *filter_format; /* filter_buffer's format */ const Babl *filter_format; /* filter_buffer's format */
GeglBuffer *filter_buffer; /* buffer for display filters */ GeglBuffer *filter_buffer; /* buffer for display filters */