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

enabled setting component activity. Connect an "extended_clicked" callback 

2001-05-06  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpchannellistview.c: enabled setting component
	activity. Connect an "extended_clicked" callback to the "To
	Selection" button for add/sub/intersect.

	* app/widgets/gimpcomponentlistitem.c: removed some commented out
	code.

	* app/widgets/gimpdrawablelistview.c: stuff.

	* app/widgets/gimplayerlistview.c: set "Raise" to insensitive if
	the active layer has no alpha.

	* libgimpwidgets/gimpbutton.c: fiddle around correctly with
	GtkButton's internals.
This commit is contained in:
Michael Natterer 2001-05-06 22:29:48 +00:00 committed by Michael Natterer
parent 1a4e7860b8
commit 427104d729
11 changed files with 331 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,3 +1,20 @@
2001-05-06 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpchannellistview.c: enabled setting component
activity. Connect an "extended_clicked" callback to the "To
Selection" button for add/sub/intersect.
* app/widgets/gimpcomponentlistitem.c: removed some commented out
code.
* app/widgets/gimpdrawablelistview.c: stuff.
* app/widgets/gimplayerlistview.c: set "Raise" to insensitive if
the active layer has no alpha.
* libgimpwidgets/gimpbutton.c: fiddle around correctly with
GtkButton's internals.
2001-05-06 Sven Neumann <sven@gimp.org>
* libgimpwidgets/Makefile.am

144
app/widgets/gimpchannellistview.c
View File

@ -30,6 +30,7 @@
#include "drawable.h"
#include "gdisplay.h"
#include "gimage_mask.h"
#include "gimpcontainer.h"
#include "gimpchannel.h"
#include "gimpdnd.h"
@ -64,10 +65,15 @@ static void gimp_channel_list_view_select_item (GimpContainerView *view,
static void gimp_channel_list_view_set_preview_size (GimpContainerView *view);
static void gimp_channel_list_view_to_selection (GimpChannelListView *view,
GimpChannel *channel);
GimpChannel *channel,
ChannelOps operation);
static void gimp_channel_list_view_toselection_clicked
(GtkWidget *widget,
GimpChannelListView *view);
static void gimp_channel_list_view_toselection_extended_clicked
(GtkWidget *widget,
guint state,
GimpChannelListView *view);
static void gimp_channel_list_view_toselection_dropped
(GtkWidget *widget,
GimpViewable *viewable,
@ -75,10 +81,17 @@ static void gimp_channel_list_view_toselection_dropped
static void gimp_channel_list_view_create_components
(GimpChannelListView *view);
static void gimp_channel_list_view_clear_components
(GimpChannelListView *view);
static void gimp_channel_list_view_mode_changed (GimpImage *gimage,
GimpChannelListView *view);
static void gimp_channel_list_view_component_toggle
(GtkList *list,
GtkWidget *child,
GimpChannelListView *view);
static GimpDrawableListViewClass *parent_class = NULL;
@ -150,9 +163,16 @@ gimp_channel_list_view_init (GimpChannelListView *view)
view->component_list);
gtk_widget_show (view->component_list);
gtk_signal_connect (GTK_OBJECT (view->component_list), "select_child",
GTK_SIGNAL_FUNC (gimp_channel_list_view_component_toggle),
view);
gtk_signal_connect (GTK_OBJECT (view->component_list), "unselect_child",
GTK_SIGNAL_FUNC (gimp_channel_list_view_component_toggle),
view);
/* To Selection button */
view->toselection_button = gtk_button_new ();
view->toselection_button = gimp_button_new ();
gtk_box_pack_start (GTK_BOX (drawable_view->button_box),
view->toselection_button, TRUE, TRUE, 0);
gtk_box_reorder_child (GTK_BOX (drawable_view->button_box),
@ -160,11 +180,17 @@ gimp_channel_list_view_init (GimpChannelListView *view)
gtk_widget_show (view->toselection_button);
gimp_help_set_help_data (view->toselection_button,
_("Channel to selection"), NULL);
_("Channel to Selection \n"
"<Shift> Add "
"<Ctrl> Subtract "
"<Shift><Ctrl> Intersect"), NULL);
gtk_signal_connect (GTK_OBJECT (view->toselection_button), "clicked",
GTK_SIGNAL_FUNC (gimp_channel_list_view_toselection_clicked),
view);
gtk_signal_connect (GTK_OBJECT (view->toselection_button), "extended_clicked",
GTK_SIGNAL_FUNC (gimp_channel_list_view_toselection_extended_clicked),
view);
pixmap = gimp_pixmap_new (toselection_xpm);
gtk_container_add (GTK_CONTAINER (view->toselection_button), pixmap);
@ -209,7 +235,7 @@ gimp_channel_list_view_set_image (GimpDrawableListView *view,
if (! gimage)
gtk_widget_hide (channel_view->component_frame);
gtk_list_clear_items (GTK_LIST (channel_view->component_list), 0, -1);
gimp_channel_list_view_clear_components (channel_view);
gtk_signal_disconnect_by_func (GTK_OBJECT (view->gimage),
gimp_channel_list_view_mode_changed,
@ -285,10 +311,38 @@ gimp_channel_list_view_set_preview_size (GimpContainerView *view)
static void
gimp_channel_list_view_to_selection (GimpChannelListView *view,
GimpChannel *channel)
GimpChannel *channel,
ChannelOps operation)
{
if (channel)
g_print ("to selection \"%s\"\n", GIMP_OBJECT (channel)->name);
{
GimpImage *gimage;
GimpChannel *new_channel;
gimage = gimp_drawable_gimage (GIMP_DRAWABLE (channel));
if (operation == CHANNEL_OP_REPLACE)
{
new_channel = channel;
gtk_object_ref (GTK_OBJECT (channel));
}
else
{
new_channel = gimp_channel_copy (gimp_image_get_mask (gimage), TRUE);
gimp_channel_combine_mask (new_channel,
channel,
operation,
0, 0);
}
gimage_mask_load (gimage, new_channel);
gtk_object_unref (GTK_OBJECT (new_channel));
gdisplays_flush ();
}
}
static void
@ -303,7 +357,41 @@ gimp_channel_list_view_toselection_clicked (GtkWidget *widget,
drawable = drawable_view->get_drawable_func (drawable_view->gimage);
if (drawable)
gimp_channel_list_view_to_selection (view, GIMP_CHANNEL (drawable));
gimp_channel_list_view_to_selection (view, GIMP_CHANNEL (drawable),
CHANNEL_OP_REPLACE);
}
static void
gimp_channel_list_view_toselection_extended_clicked (GtkWidget *widget,
guint state,
GimpChannelListView *view)
{
GimpDrawableListView *drawable_view;
GimpDrawable *drawable;
drawable_view = GIMP_DRAWABLE_LIST_VIEW (view);
drawable = drawable_view->get_drawable_func (drawable_view->gimage);
if (drawable)
{
ChannelOps operation = CHANNEL_OP_REPLACE;
if (state & GDK_SHIFT_MASK)
{
if (state & GDK_CONTROL_MASK)
operation = CHANNEL_OP_INTERSECT;
else
operation = CHANNEL_OP_ADD;
}
else if (state & GDK_CONTROL_MASK)
{
operation = CHANNEL_OP_SUB;
}
gimp_channel_list_view_to_selection (view, GIMP_CHANNEL (drawable),
operation);
}
}
static void
@ -318,7 +406,8 @@ gimp_channel_list_view_toselection_dropped (GtkWidget *widget,
if (viewable && gimp_container_have (GIMP_CONTAINER_VIEW (view)->container,
GIMP_OBJECT (viewable)))
{
gimp_channel_list_view_to_selection (view, GIMP_CHANNEL (viewable));
gimp_channel_list_view_to_selection (view, GIMP_CHANNEL (viewable),
CHANNEL_OP_REPLACE);
}
}
@ -373,11 +462,46 @@ gimp_channel_list_view_create_components (GimpChannelListView *view)
gtk_widget_queue_resize (GTK_WIDGET (view->component_frame));
}
static void
gimp_channel_list_view_clear_components (GimpChannelListView *view)
{
gtk_signal_handler_block_by_func (GTK_OBJECT (view->component_list),
gimp_channel_list_view_component_toggle,
view);
gtk_list_clear_items (GTK_LIST (view->component_list), 0, -1);
gtk_signal_handler_unblock_by_func (GTK_OBJECT (view->component_list),
gimp_channel_list_view_component_toggle,
view);
}
static void
gimp_channel_list_view_mode_changed (GimpImage *gimage,
GimpChannelListView *view)
{
gtk_list_clear_items (GTK_LIST (view->component_list), 0, -1);
gimp_channel_list_view_clear_components (view);
gimp_channel_list_view_create_components (view);
}
static void
gimp_channel_list_view_component_toggle (GtkList *list,
GtkWidget *child,
GimpChannelListView *view)
{
GimpComponentListItem *component_item;
component_item = GIMP_COMPONENT_LIST_ITEM (child);
gtk_signal_handler_block_by_func (GTK_OBJECT (view->component_list),
gimp_channel_list_view_component_toggle,
view);
gimp_image_set_component_active (GIMP_DRAWABLE_LIST_VIEW (view)->gimage,
component_item->channel,
child->state == GTK_STATE_SELECTED);
gtk_signal_handler_unblock_by_func (GTK_OBJECT (view->component_list),
gimp_channel_list_view_component_toggle,
view);
}

144
app/widgets/gimpchanneltreeview.c
View File

@ -30,6 +30,7 @@
#include "drawable.h"
#include "gdisplay.h"
#include "gimage_mask.h"
#include "gimpcontainer.h"
#include "gimpchannel.h"
#include "gimpdnd.h"
@ -64,10 +65,15 @@ static void gimp_channel_list_view_select_item (GimpContainerView *view,
static void gimp_channel_list_view_set_preview_size (GimpContainerView *view);
static void gimp_channel_list_view_to_selection (GimpChannelListView *view,
GimpChannel *channel);
GimpChannel *channel,
ChannelOps operation);
static void gimp_channel_list_view_toselection_clicked
(GtkWidget *widget,
GimpChannelListView *view);
static void gimp_channel_list_view_toselection_extended_clicked
(GtkWidget *widget,
guint state,
GimpChannelListView *view);
static void gimp_channel_list_view_toselection_dropped
(GtkWidget *widget,
GimpViewable *viewable,
@ -75,10 +81,17 @@ static void gimp_channel_list_view_toselection_dropped
static void gimp_channel_list_view_create_components
(GimpChannelListView *view);
static void gimp_channel_list_view_clear_components
(GimpChannelListView *view);
static void gimp_channel_list_view_mode_changed (GimpImage *gimage,
GimpChannelListView *view);
static void gimp_channel_list_view_component_toggle
(GtkList *list,
GtkWidget *child,
GimpChannelListView *view);
static GimpDrawableListViewClass *parent_class = NULL;
@ -150,9 +163,16 @@ gimp_channel_list_view_init (GimpChannelListView *view)
view->component_list);
gtk_widget_show (view->component_list);
gtk_signal_connect (GTK_OBJECT (view->component_list), "select_child",
GTK_SIGNAL_FUNC (gimp_channel_list_view_component_toggle),
view);
gtk_signal_connect (GTK_OBJECT (view->component_list), "unselect_child",
GTK_SIGNAL_FUNC (gimp_channel_list_view_component_toggle),
view);
/* To Selection button */
view->toselection_button = gtk_button_new ();
view->toselection_button = gimp_button_new ();
gtk_box_pack_start (GTK_BOX (drawable_view->button_box),
view->toselection_button, TRUE, TRUE, 0);
gtk_box_reorder_child (GTK_BOX (drawable_view->button_box),
@ -160,11 +180,17 @@ gimp_channel_list_view_init (GimpChannelListView *view)
gtk_widget_show (view->toselection_button);
gimp_help_set_help_data (view->toselection_button,
_("Channel to selection"), NULL);
_("Channel to Selection \n"
"<Shift> Add "
"<Ctrl> Subtract "
"<Shift><Ctrl> Intersect"), NULL);
gtk_signal_connect (GTK_OBJECT (view->toselection_button), "clicked",
GTK_SIGNAL_FUNC (gimp_channel_list_view_toselection_clicked),
view);
gtk_signal_connect (GTK_OBJECT (view->toselection_button), "extended_clicked",
GTK_SIGNAL_FUNC (gimp_channel_list_view_toselection_extended_clicked),
view);
pixmap = gimp_pixmap_new (toselection_xpm);
gtk_container_add (GTK_CONTAINER (view->toselection_button), pixmap);
@ -209,7 +235,7 @@ gimp_channel_list_view_set_image (GimpDrawableListView *view,
if (! gimage)
gtk_widget_hide (channel_view->component_frame);
gtk_list_clear_items (GTK_LIST (channel_view->component_list), 0, -1);
gimp_channel_list_view_clear_components (channel_view);
gtk_signal_disconnect_by_func (GTK_OBJECT (view->gimage),
gimp_channel_list_view_mode_changed,
@ -285,10 +311,38 @@ gimp_channel_list_view_set_preview_size (GimpContainerView *view)
static void
gimp_channel_list_view_to_selection (GimpChannelListView *view,
GimpChannel *channel)
GimpChannel *channel,
ChannelOps operation)
{
if (channel)
g_print ("to selection \"%s\"\n", GIMP_OBJECT (channel)->name);
{
GimpImage *gimage;
GimpChannel *new_channel;
gimage = gimp_drawable_gimage (GIMP_DRAWABLE (channel));
if (operation == CHANNEL_OP_REPLACE)
{
new_channel = channel;
gtk_object_ref (GTK_OBJECT (channel));
}
else
{
new_channel = gimp_channel_copy (gimp_image_get_mask (gimage), TRUE);
gimp_channel_combine_mask (new_channel,
channel,
operation,
0, 0);
}
gimage_mask_load (gimage, new_channel);
gtk_object_unref (GTK_OBJECT (new_channel));
gdisplays_flush ();
}
}
static void
@ -303,7 +357,41 @@ gimp_channel_list_view_toselection_clicked (GtkWidget *widget,
drawable = drawable_view->get_drawable_func (drawable_view->gimage);
if (drawable)
gimp_channel_list_view_to_selection (view, GIMP_CHANNEL (drawable));
gimp_channel_list_view_to_selection (view, GIMP_CHANNEL (drawable),
CHANNEL_OP_REPLACE);
}
static void
gimp_channel_list_view_toselection_extended_clicked (GtkWidget *widget,
guint state,
GimpChannelListView *view)
{
GimpDrawableListView *drawable_view;
GimpDrawable *drawable;
drawable_view = GIMP_DRAWABLE_LIST_VIEW (view);
drawable = drawable_view->get_drawable_func (drawable_view->gimage);
if (drawable)
{
ChannelOps operation = CHANNEL_OP_REPLACE;
if (state & GDK_SHIFT_MASK)
{
if (state & GDK_CONTROL_MASK)
operation = CHANNEL_OP_INTERSECT;
else
operation = CHANNEL_OP_ADD;
}
else if (state & GDK_CONTROL_MASK)
{
operation = CHANNEL_OP_SUB;
}
gimp_channel_list_view_to_selection (view, GIMP_CHANNEL (drawable),
operation);
}
}
static void
@ -318,7 +406,8 @@ gimp_channel_list_view_toselection_dropped (GtkWidget *widget,
if (viewable && gimp_container_have (GIMP_CONTAINER_VIEW (view)->container,
GIMP_OBJECT (viewable)))
{
gimp_channel_list_view_to_selection (view, GIMP_CHANNEL (viewable));
gimp_channel_list_view_to_selection (view, GIMP_CHANNEL (viewable),
CHANNEL_OP_REPLACE);
}
}
@ -373,11 +462,46 @@ gimp_channel_list_view_create_components (GimpChannelListView *view)
gtk_widget_queue_resize (GTK_WIDGET (view->component_frame));
}
static void
gimp_channel_list_view_clear_components (GimpChannelListView *view)
{
gtk_signal_handler_block_by_func (GTK_OBJECT (view->component_list),
gimp_channel_list_view_component_toggle,
view);
gtk_list_clear_items (GTK_LIST (view->component_list), 0, -1);
gtk_signal_handler_unblock_by_func (GTK_OBJECT (view->component_list),
gimp_channel_list_view_component_toggle,
view);
}
static void
gimp_channel_list_view_mode_changed (GimpImage *gimage,
GimpChannelListView *view)
{
gtk_list_clear_items (GTK_LIST (view->component_list), 0, -1);
gimp_channel_list_view_clear_components (view);
gimp_channel_list_view_create_components (view);
}
static void
gimp_channel_list_view_component_toggle (GtkList *list,
GtkWidget *child,
GimpChannelListView *view)
{
GimpComponentListItem *component_item;
component_item = GIMP_COMPONENT_LIST_ITEM (child);
gtk_signal_handler_block_by_func (GTK_OBJECT (view->component_list),
gimp_channel_list_view_component_toggle,
view);
gimp_image_set_component_active (GIMP_DRAWABLE_LIST_VIEW (view)->gimage,
component_item->channel,
child->state == GTK_STATE_SELECTED);
gtk_signal_handler_unblock_by_func (GTK_OBJECT (view->component_list),
gimp_channel_list_view_component_toggle,
view);
}

57
app/widgets/gimpcomponentlistitem.c
View File

@ -55,8 +55,6 @@ static void gimp_component_list_item_visibility_changed (GimpImage *gimage
ChannelType channel,
gpointer data);
static void gimp_component_list_item_state_changed (GtkWidget *widget,
GtkStateType previous_state);
static void gimp_component_list_item_active_changed (GimpImage *gimage,
ChannelType channel,
gpointer data);
@ -105,8 +103,6 @@ gimp_component_list_item_class_init (GimpComponentListItemClass *klass)
parent_class = gtk_type_class (GIMP_TYPE_LIST_ITEM);
widget_class->state_changed = gimp_component_list_item_state_changed;
list_item_class->set_viewable = gimp_component_list_item_set_viewable;
}
@ -331,59 +327,6 @@ gimp_component_list_item_visibility_changed (GimpImage *gimage,
}
}
static void
gimp_component_list_item_state_changed (GtkWidget *widget,
GtkStateType previous_state)
{
/*
GimpComponentListItem *component_item;
GimpListItem *list_item;
GimpImage *gimage;
gboolean active;
*/
if (GTK_WIDGET_CLASS (parent_class)->state_changed)
GTK_WIDGET_CLASS (parent_class)->state_changed (widget, previous_state);
/*
component_item = GIMP_COMPONENT_LIST_ITEM (widget);
list_item = GIMP_LIST_ITEM (widget);
gimage = GIMP_IMAGE (GIMP_PREVIEW (list_item->preview)->viewable);
g_print ("state: %d\n", widget->state);
if (widget->state == GTK_STATE_SELECTED &&
previous_state == GTK_STATE_NORMAL)
{
active = TRUE;
}
else if (widget->state == GTK_STATE_NORMAL &&
previous_state == GTK_STATE_SELECTED)
{
active = FALSE;
}
else
return;
g_print ("active: %d\n", active);
if (active != gimp_image_get_component_active (gimage,
component_item->channel))
{
gtk_signal_handler_block_by_func (GTK_OBJECT (gimage),
gimp_component_list_item_active_changed,
widget);
gimp_image_set_component_active (gimage, component_item->channel,
active);
gtk_signal_handler_unblock_by_func (GTK_OBJECT (gimage),
gimp_component_list_item_active_changed,
widget);
}
*/
}
static void
gimp_component_list_item_active_changed (GimpImage *gimage,
ChannelType channel,

4
app/widgets/gimpdrawablelistview.c
View File

@ -235,7 +235,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
gtk_widget_show (view->raise_button);
gimp_help_set_help_data (view->raise_button, _("Raise \n"
"<shift> To Top"), NULL);
"<Shift> To Top"), NULL);
gtk_signal_connect (GTK_OBJECT (view->raise_button), "clicked",
GTK_SIGNAL_FUNC (gimp_drawable_list_view_raise_clicked),
@ -256,7 +256,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
gtk_widget_show (view->lower_button);
gimp_help_set_help_data (view->lower_button, _("Lower \n"
"<shift> To Bottom"), NULL);
"<Shift> To Bottom"), NULL);
gtk_signal_connect (GTK_OBJECT (view->lower_button), "clicked",
GTK_SIGNAL_FUNC (gimp_drawable_list_view_lower_clicked),

4
app/widgets/gimpdrawabletreeview.c
View File

@ -235,7 +235,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
gtk_widget_show (view->raise_button);
gimp_help_set_help_data (view->raise_button, _("Raise \n"
"<shift> To Top"), NULL);
"<Shift> To Top"), NULL);
gtk_signal_connect (GTK_OBJECT (view->raise_button), "clicked",
GTK_SIGNAL_FUNC (gimp_drawable_list_view_raise_clicked),
@ -256,7 +256,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
gtk_widget_show (view->lower_button);
gimp_help_set_help_data (view->lower_button, _("Lower \n"
"<shift> To Bottom"), NULL);
"<Shift> To Bottom"), NULL);
gtk_signal_connect (GTK_OBJECT (view->lower_button), "clicked",
GTK_SIGNAL_FUNC (gimp_drawable_list_view_lower_clicked),

4
app/widgets/gimpitemlistview.c
View File

@ -235,7 +235,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
gtk_widget_show (view->raise_button);
gimp_help_set_help_data (view->raise_button, _("Raise \n"
"<shift> To Top"), NULL);
"<Shift> To Top"), NULL);
gtk_signal_connect (GTK_OBJECT (view->raise_button), "clicked",
GTK_SIGNAL_FUNC (gimp_drawable_list_view_raise_clicked),
@ -256,7 +256,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
gtk_widget_show (view->lower_button);
gimp_help_set_help_data (view->lower_button, _("Lower \n"
"<shift> To Bottom"), NULL);
"<Shift> To Bottom"), NULL);
gtk_signal_connect (GTK_OBJECT (view->lower_button), "clicked",
GTK_SIGNAL_FUNC (gimp_drawable_list_view_lower_clicked),

4
app/widgets/gimpitemtreeview.c
View File

@ -235,7 +235,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
gtk_widget_show (view->raise_button);
gimp_help_set_help_data (view->raise_button, _("Raise \n"
"<shift> To Top"), NULL);
"<Shift> To Top"), NULL);
gtk_signal_connect (GTK_OBJECT (view->raise_button), "clicked",
GTK_SIGNAL_FUNC (gimp_drawable_list_view_raise_clicked),
@ -256,7 +256,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view)
gtk_widget_show (view->lower_button);
gimp_help_set_help_data (view->lower_button, _("Lower \n"
"<shift> To Bottom"), NULL);
"<Shift> To Bottom"), NULL);
gtk_signal_connect (GTK_OBJECT (view->lower_button), "clicked",
GTK_SIGNAL_FUNC (gimp_drawable_list_view_lower_clicked),

22
app/widgets/gimplayerlistview.c
View File

@ -295,11 +295,14 @@ gimp_layer_list_view_select_item (GimpContainerView *view,
GimpViewable *item,
gpointer insert_data)
{
GimpLayerListView *list_view;
gboolean options_sensitive = FALSE;
gboolean anchor_sensitive = FALSE;
GimpDrawableListView *drawable_view;
GimpLayerListView *list_view;
gboolean options_sensitive = FALSE;
gboolean anchor_sensitive = FALSE;
gboolean raise_sensitive = FALSE;
list_view = GIMP_LAYER_LIST_VIEW (view);
list_view = GIMP_LAYER_LIST_VIEW (view);
drawable_view = GIMP_DRAWABLE_LIST_VIEW (view);
if (GIMP_CONTAINER_VIEW_CLASS (parent_class)->select_item)
GIMP_CONTAINER_VIEW_CLASS (parent_class)->select_item (view,
@ -316,10 +319,17 @@ gimp_layer_list_view_select_item (GimpContainerView *view,
{
anchor_sensitive = TRUE;
}
if (gimp_drawable_has_alpha (GIMP_DRAWABLE (item)) &&
gimp_container_get_child_index (view->container, GIMP_OBJECT (item)))
{
raise_sensitive = TRUE;
}
}
gtk_widget_set_sensitive (list_view->options_box, options_sensitive);
gtk_widget_set_sensitive (list_view->anchor_button, anchor_sensitive);
gtk_widget_set_sensitive (list_view->options_box, options_sensitive);
gtk_widget_set_sensitive (list_view->anchor_button, anchor_sensitive);
gtk_widget_set_sensitive (drawable_view->raise_button, raise_sensitive);
}

22
app/widgets/gimplayertreeview.c
View File

@ -295,11 +295,14 @@ gimp_layer_list_view_select_item (GimpContainerView *view,
GimpViewable *item,
gpointer insert_data)
{
GimpLayerListView *list_view;
gboolean options_sensitive = FALSE;
gboolean anchor_sensitive = FALSE;
GimpDrawableListView *drawable_view;
GimpLayerListView *list_view;
gboolean options_sensitive = FALSE;
gboolean anchor_sensitive = FALSE;
gboolean raise_sensitive = FALSE;
list_view = GIMP_LAYER_LIST_VIEW (view);
list_view = GIMP_LAYER_LIST_VIEW (view);
drawable_view = GIMP_DRAWABLE_LIST_VIEW (view);
if (GIMP_CONTAINER_VIEW_CLASS (parent_class)->select_item)
GIMP_CONTAINER_VIEW_CLASS (parent_class)->select_item (view,
@ -316,10 +319,17 @@ gimp_layer_list_view_select_item (GimpContainerView *view,
{
anchor_sensitive = TRUE;
}
if (gimp_drawable_has_alpha (GIMP_DRAWABLE (item)) &&
gimp_container_get_child_index (view->container, GIMP_OBJECT (item)))
{
raise_sensitive = TRUE;
}
}
gtk_widget_set_sensitive (list_view->options_box, options_sensitive);
gtk_widget_set_sensitive (list_view->anchor_button, anchor_sensitive);
gtk_widget_set_sensitive (list_view->options_box, options_sensitive);
gtk_widget_set_sensitive (list_view->anchor_button, anchor_sensitive);
gtk_widget_set_sensitive (drawable_view->raise_button, raise_sensitive);
}

11
libgimpwidgets/gimpbutton.c
View File

@ -152,18 +152,17 @@ static gint
gimp_button_button_release (GtkWidget *widget,
GdkEventButton *bevent)
{
gboolean in_button = FALSE;
GtkButton *button;
gboolean in_button = FALSE;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GIMP_IS_BUTTON (widget), FALSE);
g_return_val_if_fail (bevent != NULL, FALSE);
button = GTK_BUTTON (widget);
if (bevent->button == 1)
{
GtkButton *button;
button = GTK_BUTTON (widget);
in_button = button->in_button;
if (in_button &&
@ -183,6 +182,8 @@ gimp_button_button_release (GtkWidget *widget,
if (bevent->button == 1 && in_button)
{
button->in_button = TRUE;
gtk_widget_set_state (widget, GTK_STATE_PRELIGHT);
gtk_widget_draw (widget, NULL);
}