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

app: don't use gtk_widget_modify_text() in GimpContainerEntry 

Instead, show an EEK wilber icon if an object with the entered name
doesn't exist.
This commit is contained in:
Michael Natterer 2018-05-11 12:42:01 +02:00
parent 465300f0ae
commit 1fcebb5a73
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/widgets/gimpcontainerentry.c
View File

@ -25,6 +25,8 @@
#include <gegl.h> #include <gegl.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "widgets-types.h" #include "widgets-types.h"
#include "core/gimpcontainer.h" #include "core/gimpcontainer.h"
@ -334,19 +336,18 @@ gimp_container_entry_select_item (GimpContainerView *view,
g_object_add_weak_pointer (G_OBJECT (container_entry->viewable), g_object_add_weak_pointer (G_OBJECT (container_entry->viewable),
(gpointer) &container_entry->viewable); (gpointer) &container_entry->viewable);
gtk_widget_modify_text (GTK_WIDGET (entry), GTK_STATE_NORMAL, NULL); gtk_entry_set_icon_from_icon_name (entry,
GTK_ENTRY_ICON_SECONDARY,
NULL);
} }
else else
{ {
/* The selected item does not exist. */ /* The selected item does not exist. */
GdkColor gdk_red; gtk_entry_set_icon_from_icon_name (entry,
GTK_ENTRY_ICON_SECONDARY,
gdk_red.red = 65535; GIMP_ICON_WILBER_EEK);
gdk_red.green = 0;
gdk_red.blue = 0;
gtk_widget_modify_text (GTK_WIDGET (entry), GTK_STATE_NORMAL, &gdk_red);
} }
gtk_entry_set_text (entry, viewable? gimp_object_get_name (viewable) : ""); gtk_entry_set_text (entry, viewable? gimp_object_get_name (viewable) : "");
g_signal_handlers_unblock_by_func (entry, g_signal_handlers_unblock_by_func (entry,
@ -405,19 +406,18 @@ gimp_container_entry_changed (GtkEntry *entry,
g_object_add_weak_pointer (G_OBJECT (container_entry->viewable), g_object_add_weak_pointer (G_OBJECT (container_entry->viewable),
(gpointer) &container_entry->viewable); (gpointer) &container_entry->viewable);
gtk_widget_modify_text (GTK_WIDGET (entry), GTK_STATE_NORMAL, NULL);
gimp_container_view_item_selected (view, GIMP_VIEWABLE (object)); gimp_container_view_item_selected (view, GIMP_VIEWABLE (object));
gtk_entry_set_icon_from_icon_name (entry,
GTK_ENTRY_ICON_SECONDARY,
NULL);
} }
else else
{ {
/* While editing the entry, contents shows in red for non-existent item. */ /* While editing the entry, show EEK for non-existent item. */
GdkColor gdk_red; gtk_entry_set_icon_from_icon_name (entry,
GTK_ENTRY_ICON_SECONDARY,
gdk_red.red = 65535; GIMP_ICON_WILBER_EEK);
gdk_red.green = 0;
gdk_red.blue = 0;
gtk_widget_modify_text (GTK_WIDGET (entry), GTK_STATE_NORMAL, &gdk_red);
} }
} }