From ab6f72912ceca3ddf9e8715a6069d39eb46ab3c0 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sun, 3 Dec 2000 19:18:01 +0000 Subject: [PATCH] when applying or deleting the layer mask, we have to call 2000-12-03 Michael Natterer * app/layers_dialog.c: when applying or deleting the layer mask, we have to call layers_dialog_set_menu_sensitivity() ourselves whenever calling layer_widget_layer_flush() instead of gdisplays_flush(). --- ChangeLog | 9 ++++++++- app/gui/layers-dialog.c | 10 ++++++++-- app/layers_dialog.c | 10 ++++++++-- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb32746f5b..8b3bbf58f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,16 @@ +2000-12-03 Michael Natterer + + * app/layers_dialog.c: when applying or deleting the layer mask, + we have to call layers_dialog_set_menu_sensitivity() ourselves + whenever calling layer_widget_layer_flush() instead of + gdisplays_flush(). + 2000-12-03 Michael Natterer * plug-ins/gflare/gflare.c * libgimp/gimpunitmenu.c * libgimp/gimpwidgets.c: set separators of option menus insensitive. - (see Sven's fix below below). + (see Sven's fix below). * app/layers_dialog.c: set "Merge Down" insensitive for the bottom layer. diff --git a/app/gui/layers-dialog.c b/app/gui/layers-dialog.c index 2916008dc0..eafe2f5400 100644 --- a/app/gui/layers-dialog.c +++ b/app/gui/layers-dialog.c @@ -1732,12 +1732,15 @@ layers_dialog_apply_layer_mask_callback (GtkWidget *widget, layer, APPLY); if (flush) - gdisplays_flush (); + { + gdisplays_flush (); + } else { LayerWidget *layer_widget = layer_widget_get_ID (layer); layer_widget_layer_flush (layer_widget->list_item, NULL); + layers_dialog_set_menu_sensitivity (); } } } @@ -1762,12 +1765,15 @@ layers_dialog_delete_layer_mask_callback (GtkWidget *widget, layer, DISCARD); if (flush) - gdisplays_flush (); + { + gdisplays_flush (); + } else { LayerWidget *layer_widget = layer_widget_get_ID (layer); layer_widget_layer_flush (layer_widget->list_item, NULL); + layers_dialog_set_menu_sensitivity (); } } } diff --git a/app/layers_dialog.c b/app/layers_dialog.c index 2916008dc0..eafe2f5400 100644 --- a/app/layers_dialog.c +++ b/app/layers_dialog.c @@ -1732,12 +1732,15 @@ layers_dialog_apply_layer_mask_callback (GtkWidget *widget, layer, APPLY); if (flush) - gdisplays_flush (); + { + gdisplays_flush (); + } else { LayerWidget *layer_widget = layer_widget_get_ID (layer); layer_widget_layer_flush (layer_widget->list_item, NULL); + layers_dialog_set_menu_sensitivity (); } } } @@ -1762,12 +1765,15 @@ layers_dialog_delete_layer_mask_callback (GtkWidget *widget, layer, DISCARD); if (flush) - gdisplays_flush (); + { + gdisplays_flush (); + } else { LayerWidget *layer_widget = layer_widget_get_ID (layer); layer_widget_layer_flush (layer_widget->list_item, NULL); + layers_dialog_set_menu_sensitivity (); } } }