[gimp/gimp-2-10] app: use GimpToolButton in GimpToolPalette
- From: Ell <ell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-10] app: use GimpToolButton in GimpToolPalette
- Date: Thu, 30 Jan 2020 00:56:57 +0000 (UTC)
commit 0f4f4f28a452a95edb6532d68f7dbe32a7d282cf
Author: Ell <ell_se yahoo com>
Date: Wed Jan 29 22:09:07 2020 +0200
app: use GimpToolButton in GimpToolPalette
In GimpToolPalette, replace the direct implementation of tool
buttons with GimpToolButton, added in the previous commit.
app/widgets/gimptoolpalette.c | 359 ++++++++++++++++--------------------------
1 file changed, 138 insertions(+), 221 deletions(-)
---
diff --git a/app/widgets/gimptoolpalette.c b/app/widgets/gimptoolpalette.c
index 9524af620e..0a941f0c38 100644
--- a/app/widgets/gimptoolpalette.c
+++ b/app/widgets/gimptoolpalette.c
@@ -31,9 +31,11 @@
#include "core/gimp.h"
#include "core/gimpcontext.h"
-#include "core/gimptoolinfo.h"
+#include "core/gimpcontainer.h"
+#include "core/gimptoolitem.h"
#include "gimptoolbox.h"
+#include "gimptoolbutton.h"
#include "gimptoolpalette.h"
#include "gimpuimanager.h"
#include "gimpwidgets-utils.h"
@@ -45,9 +47,6 @@
#define DEFAULT_TOOL_ICON_SIZE GTK_ICON_SIZE_BUTTON
#define DEFAULT_BUTTON_RELIEF GTK_RELIEF_NONE
-#define TOOL_BUTTON_DATA_KEY "gimp-tool-palette-item"
-#define TOOL_INFO_DATA_KEY "gimp-tool-info"
-
typedef struct _GimpToolPalettePrivate GimpToolPalettePrivate;
@@ -55,6 +54,9 @@ struct _GimpToolPalettePrivate
{
GimpToolbox *toolbox;
+ GtkWidget *group;
+ GHashTable *buttons;
+
gint tool_rows;
gint tool_columns;
};
@@ -62,30 +64,30 @@ struct _GimpToolPalettePrivate
#define GET_PRIVATE(p) ((GimpToolPalettePrivate *) gimp_tool_palette_get_instance_private ((GimpToolPalette
*) (p)))
-static void gimp_tool_palette_dispose (GObject *object);
+static void gimp_tool_palette_finalize (GObject *object);
+
+static void gimp_tool_palette_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
+static void gimp_tool_palette_style_set (GtkWidget *widget,
+ GtkStyle *previous_style);
-static void gimp_tool_palette_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
-static void gimp_tool_palette_style_set (GtkWidget *widget,
- GtkStyle *previous_style);
-static void gimp_tool_palette_hierarchy_changed (GtkWidget *widget,
- GtkWidget *previous_toplevel);
+static void gimp_tool_palette_tool_add (GimpContainer *container,
+ GimpToolItem *tool_item,
+ GimpToolPalette *palette);
+static void gimp_tool_palette_tool_remove (GimpContainer *container,
+ GimpToolItem *tool_item,
+ GimpToolPalette *palette);
+static void gimp_tool_palette_tool_reorder (GimpContainer *container,
+ GimpToolItem *tool_item,
+ gint index,
+ GimpToolPalette *palette);
-static void gimp_tool_palette_tool_changed (GimpContext *context,
- GimpToolInfo *tool_info,
- GimpToolPalette *palette);
-static void gimp_tool_palette_tool_reorder (GimpContainer *container,
- GimpToolInfo *tool_info,
- gint index,
- GimpToolPalette *palette);
-static void gimp_tool_palette_tool_button_toggled (GtkWidget *widget,
- GimpToolPalette *palette);
-static gboolean gimp_tool_palette_tool_button_press (GtkWidget *widget,
- GdkEventButton *bevent,
- GimpToolPalette *palette);
+static void gimp_tool_palette_config_size_changed (GimpGuiConfig *config,
+ GimpToolPalette *palette);
-static void gimp_tool_palette_config_size_changed (GimpGuiConfig *config,
- GimpToolPalette *palette);
+static void gimp_tool_palette_add_button (GimpToolPalette *palette,
+ GimpToolItem *tool_item,
+ gint index);
G_DEFINE_TYPE_WITH_PRIVATE (GimpToolPalette, gimp_tool_palette,
@@ -100,11 +102,10 @@ gimp_tool_palette_class_init (GimpToolPaletteClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
- object_class->dispose = gimp_tool_palette_dispose;
+ object_class->finalize = gimp_tool_palette_finalize;
- widget_class->size_allocate = gimp_tool_palette_size_allocate;
- widget_class->style_set = gimp_tool_palette_style_set;
- widget_class->hierarchy_changed = gimp_tool_palette_hierarchy_changed;
+ widget_class->size_allocate = gimp_tool_palette_size_allocate;
+ widget_class->style_set = gimp_tool_palette_style_set;
gtk_widget_class_install_style_property (widget_class,
g_param_spec_enum ("tool-icon-size",
@@ -124,14 +125,20 @@ gimp_tool_palette_class_init (GimpToolPaletteClass *klass)
static void
gimp_tool_palette_init (GimpToolPalette *palette)
{
+ GimpToolPalettePrivate *private = GET_PRIVATE (palette);
+
+ private->buttons = g_hash_table_new (g_direct_hash, g_direct_equal);
+
gtk_tool_palette_set_style (GTK_TOOL_PALETTE (palette), GTK_TOOLBAR_ICONS);
}
static void
-gimp_tool_palette_dispose (GObject *object)
+gimp_tool_palette_finalize (GObject *object)
{
GimpToolPalettePrivate *private = GET_PRIVATE (object);
+ g_clear_pointer (&private->buttons, g_hash_table_unref);
+
if (private->toolbox)
{
GimpContext *context = gimp_toolbox_get_context (private->toolbox);
@@ -142,7 +149,7 @@ gimp_tool_palette_dispose (GObject *object)
object);
}
- G_OBJECT_CLASS (parent_class)->dispose (object);
+ G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void
@@ -158,19 +165,19 @@ gimp_tool_palette_size_allocate (GtkWidget *widget,
if (gimp_tool_palette_get_button_size (GIMP_TOOL_PALETTE (widget),
&button_width, &button_height))
{
- Gimp *gimp = gimp_toolbox_get_context (private->toolbox)->gimp;
- GList *list;
- gint n_tools;
- gint tool_rows;
- gint tool_columns;
-
- for (list = gimp_get_tool_info_iter (gimp), n_tools = 0;
- list;
- list = list->next)
- {
- GimpToolInfo *tool_info = list->data;
+ GimpToolItem *tool_item;
+ GHashTableIter iter;
+ gint n_tools;
+ gint tool_rows;
+ gint tool_columns;
+
+ n_tools = 0;
+
+ g_hash_table_iter_init (&iter, private->buttons);
- if (gimp_tool_item_get_visible (GIMP_TOOL_ITEM (tool_info)))
+ while (g_hash_table_iter_next (&iter, (gpointer *) &tool_item, NULL))
+ {
+ if (gimp_tool_item_get_visible (tool_item))
n_tools++;
}
@@ -198,8 +205,9 @@ gimp_tool_palette_style_set (GtkWidget *widget,
{
GimpToolPalettePrivate *private = GET_PRIVATE (widget);
Gimp *gimp;
+ GtkWidget *tool_button;
+ GHashTableIter iter;
GtkReliefStyle relief;
- GList *list;
GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style);
@@ -209,85 +217,24 @@ gimp_tool_palette_style_set (GtkWidget *widget,
gimp = gimp_toolbox_get_context (private->toolbox)->gimp;
gtk_widget_style_get (widget,
- "button-relief", &relief,
+ "button-relief", &relief,
NULL);
gimp_tool_palette_config_size_changed (GIMP_GUI_CONFIG (gimp->config),
GIMP_TOOL_PALETTE (widget));
- for (list = gimp_get_tool_info_iter (gimp);
- list;
- list = g_list_next (list))
- {
- GimpToolInfo *tool_info = list->data;
- GtkWidget *tool_button;
- tool_button = g_object_get_data (G_OBJECT (tool_info),
- TOOL_BUTTON_DATA_KEY);
+ g_hash_table_iter_init (&iter, private->buttons);
- if (tool_button)
- {
- GtkWidget *button = gtk_bin_get_child (GTK_BIN (tool_button));
+ while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &tool_button))
+ {
+ GtkWidget *button = gtk_bin_get_child (GTK_BIN (tool_button));
- gtk_button_set_relief (GTK_BUTTON (button), relief);
- }
+ gtk_button_set_relief (GTK_BUTTON (button), relief);
}
gimp_dock_invalidate_geometry (GIMP_DOCK (private->toolbox));
}
-static void
-gimp_tool_palette_hierarchy_changed (GtkWidget *widget,
- GtkWidget *previous_toplevel)
-{
- GimpToolPalettePrivate *private = GET_PRIVATE (widget);
- GimpUIManager *ui_manager;
-
- ui_manager = gimp_dock_get_ui_manager (GIMP_DOCK (private->toolbox));
-
- if (ui_manager)
- {
- GimpContext *context = gimp_toolbox_get_context (private->toolbox);
- GList *list;
-
- for (list = gimp_get_tool_info_iter (context->gimp);
- list;
- list = g_list_next (list))
- {
- GimpToolInfo *tool_info = list->data;
- GtkToolItem *item;
- GimpAction *action;
- const gchar *identifier;
- gchar *tmp;
- gchar *name;
-
- item = g_object_get_data (G_OBJECT (tool_info), TOOL_BUTTON_DATA_KEY);
-
- identifier = gimp_object_get_name (tool_info);
-
- tmp = g_strndup (identifier + strlen ("gimp-"),
- strlen (identifier) - strlen ("gimp--tool"));
- name = g_strdup_printf ("tools-%s", tmp);
- g_free (tmp);
-
- action = gimp_ui_manager_find_action (ui_manager, "tools", name);
- g_free (name);
-
- if (action)
- gimp_widget_set_accel_help (GTK_WIDGET (item), action);
- else
- gimp_help_set_help_data (GTK_WIDGET (item),
- tool_info->tooltip, tool_info->help_id);
-
- /* Make sure the toolbox buttons won't grab focus, which has
- * nearly no practical use, and prevents various actions until
- * you click back in canvas.
- */
- gtk_widget_set_can_focus (gtk_bin_get_child (GTK_BIN (item)),
- FALSE);
- }
- }
-}
-
/* public functions */
@@ -303,8 +250,6 @@ gimp_tool_palette_set_toolbox (GimpToolPalette *palette,
{
GimpToolPalettePrivate *private;
GimpContext *context;
- GtkWidget *group;
- GSList *item_group = NULL;
GList *list;
g_return_if_fail (GIMP_IS_TOOL_PALETTE (palette));
@@ -323,58 +268,31 @@ gimp_tool_palette_set_toolbox (GimpToolPalette *palette,
context = gimp_toolbox_get_context (toolbox);
- group = gtk_tool_item_group_new (_("Tools"));
- gtk_tool_item_group_set_label_widget (GTK_TOOL_ITEM_GROUP (group), NULL);
- gtk_container_add (GTK_CONTAINER (palette), group);
- gtk_widget_show (group);
+ private->group = gtk_tool_item_group_new (_("Tools"));
+ gtk_tool_item_group_set_label_widget (GTK_TOOL_ITEM_GROUP (private->group),
+ NULL);
+ gtk_container_add (GTK_CONTAINER (palette), private->group);
+ gtk_widget_show (private->group);
- for (list = gimp_get_tool_info_iter (context->gimp);
+ for (list = gimp_get_tool_item_iter (context->gimp);
list;
list = g_list_next (list))
{
- GimpToolInfo *tool_info = list->data;
- GtkToolItem *item;
- const gchar *icon_name;
-
- icon_name = gimp_viewable_get_icon_name (GIMP_VIEWABLE (tool_info));
-
- item = gtk_radio_tool_button_new (item_group);
- gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), icon_name);
- item_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (item));
- gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
- gtk_widget_show (GTK_WIDGET (item));
-
- g_object_bind_property (tool_info, "visible",
- item, "visible-horizontal",
- G_BINDING_SYNC_CREATE);
- g_object_bind_property (tool_info, "visible",
- item, "visible-vertical",
- G_BINDING_SYNC_CREATE);
-
- g_object_set_data (G_OBJECT (tool_info), TOOL_BUTTON_DATA_KEY, item);
- g_object_set_data (G_OBJECT (item) , TOOL_INFO_DATA_KEY, tool_info);
-
- g_signal_connect (item, "toggled",
- G_CALLBACK (gimp_tool_palette_tool_button_toggled),
- palette);
-
- g_signal_connect (gtk_bin_get_child (GTK_BIN (item)), "button-press-event",
- G_CALLBACK (gimp_tool_palette_tool_button_press),
- palette);
+ GimpToolItem *tool_item = list->data;
+
+ gimp_tool_palette_add_button (palette, tool_item, -1);
}
- g_signal_connect_object (context->gimp->tool_info_list, "reorder",
+ g_signal_connect_object (context->gimp->tool_item_list, "add",
+ G_CALLBACK (gimp_tool_palette_tool_add),
+ palette, 0);
+ g_signal_connect_object (context->gimp->tool_item_list, "remove",
+ G_CALLBACK (gimp_tool_palette_tool_remove),
+ palette, 0);
+ g_signal_connect_object (context->gimp->tool_item_list, "reorder",
G_CALLBACK (gimp_tool_palette_tool_reorder),
palette, 0);
- g_signal_connect_object (context, "tool-changed",
- G_CALLBACK (gimp_tool_palette_tool_changed),
- palette,
- 0);
- gimp_tool_palette_tool_changed (context,
- gimp_context_get_tool (context),
- palette);
-
/* Update the toolbox icon size on config change. */
g_signal_connect (GIMP_GUI_CONFIG (context->gimp->config),
"size-changed",
@@ -390,7 +308,7 @@ gimp_tool_palette_get_button_size (GimpToolPalette *palette,
gint *height)
{
GimpToolPalettePrivate *private;
- GimpToolInfo *tool_info;
+ GHashTableIter iter;
GtkWidget *tool_button;
g_return_val_if_fail (GIMP_IS_TOOL_PALETTE (palette), FALSE);
@@ -399,11 +317,9 @@ gimp_tool_palette_get_button_size (GimpToolPalette *palette,
private = GET_PRIVATE (palette);
- tool_info = gimp_get_tool_info (gimp_toolbox_get_context (private->toolbox)->gimp,
- "gimp-rect-select-tool");
- tool_button = g_object_get_data (G_OBJECT (tool_info), TOOL_BUTTON_DATA_KEY);
+ g_hash_table_iter_init (&iter, private->buttons);
- if (tool_button)
+ if (g_hash_table_iter_next (&iter, NULL, (gpointer *) &tool_button))
{
GtkRequisition button_requisition;
@@ -422,83 +338,51 @@ gimp_tool_palette_get_button_size (GimpToolPalette *palette,
/* private functions */
static void
-gimp_tool_palette_tool_changed (GimpContext *context,
- GimpToolInfo *tool_info,
- GimpToolPalette *palette)
+gimp_tool_palette_tool_add (GimpContainer *container,
+ GimpToolItem *tool_item,
+ GimpToolPalette *palette)
{
- if (tool_info)
- {
- GtkWidget *tool_button = g_object_get_data (G_OBJECT (tool_info),
- TOOL_BUTTON_DATA_KEY);
-
- if (tool_button &&
- ! gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (tool_button)))
- {
- g_signal_handlers_block_by_func (tool_button,
- gimp_tool_palette_tool_button_toggled,
- palette);
-
- gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (tool_button),
- TRUE);
-
- g_signal_handlers_unblock_by_func (tool_button,
- gimp_tool_palette_tool_button_toggled,
- palette);
- }
- }
+ gimp_tool_palette_add_button (
+ palette,
+ tool_item,
+ gimp_container_get_child_index (container, GIMP_OBJECT (tool_item)));
}
static void
-gimp_tool_palette_tool_reorder (GimpContainer *container,
- GimpToolInfo *tool_info,
- gint index,
- GimpToolPalette *palette)
+gimp_tool_palette_tool_remove (GimpContainer *container,
+ GimpToolItem *tool_item,
+ GimpToolPalette *palette)
{
- if (tool_info)
+ GimpToolPalettePrivate *private = GET_PRIVATE (palette);
+ GtkWidget *tool_button;
+
+ tool_button = g_hash_table_lookup (private->buttons, tool_item);
+
+ if (tool_button)
{
- GtkWidget *button = g_object_get_data (G_OBJECT (tool_info),
- TOOL_BUTTON_DATA_KEY);
- GtkWidget *group = gtk_widget_get_parent (button);
+ g_hash_table_remove (private->buttons, tool_item);
- gtk_tool_item_group_set_item_position (GTK_TOOL_ITEM_GROUP (group),
- GTK_TOOL_ITEM (button), index);
+ gtk_container_remove (GTK_CONTAINER (private->group), tool_button);
}
}
static void
-gimp_tool_palette_tool_button_toggled (GtkWidget *widget,
- GimpToolPalette *palette)
+gimp_tool_palette_tool_reorder (GimpContainer *container,
+ GimpToolItem *tool_item,
+ gint index,
+ GimpToolPalette *palette)
{
GimpToolPalettePrivate *private = GET_PRIVATE (palette);
- GimpToolInfo *tool_info;
+ GtkWidget *tool_button;
- tool_info = g_object_get_data (G_OBJECT (widget), TOOL_INFO_DATA_KEY);
+ tool_button = g_hash_table_lookup (private->buttons, tool_item);
- if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (widget)))
- gimp_context_set_tool (gimp_toolbox_get_context (private->toolbox), tool_info);
-}
-
-static gboolean
-gimp_tool_palette_tool_button_press (GtkWidget *widget,
- GdkEventButton *event,
- GimpToolPalette *palette)
-{
- GimpToolPalettePrivate *private = GET_PRIVATE (palette);
-
- if (event->type == GDK_2BUTTON_PRESS && event->button == 1)
+ if (tool_button)
{
- GimpContext *context = gimp_toolbox_get_context (private->toolbox);
- GimpDock *dock = GIMP_DOCK (private->toolbox);
-
- gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy
(context->gimp)),
- context->gimp,
- gimp_dock_get_dialog_factory (dock),
- gtk_widget_get_screen (widget),
- gimp_widget_get_monitor (widget),
- "gimp-tool-options");
+ gtk_tool_item_group_set_item_position (
+ GTK_TOOL_ITEM_GROUP (private->group),
+ GTK_TOOL_ITEM (tool_button), index);
}
-
- return FALSE;
}
static void
@@ -535,3 +419,36 @@ gimp_tool_palette_config_size_changed (GimpGuiConfig *config,
gtk_tool_palette_set_icon_size (GTK_TOOL_PALETTE (palette), tool_icon_size);
}
+
+static void
+gimp_tool_palette_add_button (GimpToolPalette *palette,
+ GimpToolItem *tool_item,
+ gint index)
+{
+ GimpToolPalettePrivate *private = GET_PRIVATE (palette);
+ GtkToolItem *tool_button;
+ GtkWidget *button;
+ GtkReliefStyle relief;
+
+ tool_button = gimp_tool_button_new (private->toolbox, tool_item);
+ gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (private->group),
+ tool_button, index);
+ gtk_widget_show (GTK_WIDGET (tool_button));
+
+ g_object_bind_property (tool_item, "visible",
+ tool_button, "visible-horizontal",
+ G_BINDING_SYNC_CREATE);
+ g_object_bind_property (tool_item, "visible",
+ tool_button, "visible-vertical",
+ G_BINDING_SYNC_CREATE);
+
+ button = gtk_bin_get_child (GTK_BIN (tool_button));
+
+ gtk_widget_style_get (GTK_WIDGET (palette),
+ "button-relief", &relief,
+ NULL);
+
+ gtk_button_set_relief (GTK_BUTTON (button), relief);
+
+ g_hash_table_insert (private->buttons, tool_item, tool_button);
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
