eUgEntOptIc44/gimp
1
1
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-10-06 01:12:40 +02:00
Code Issues Releases Activity

tools: Connect MoveOptions and TransformOptions to icon size

Browse Source 
Resolves #13044
Same code as 816fb1c6, applied to the Move icon box
in GimpMoveOptions and the Transform icon box
in GimpTransformOptions.
This commit is contained in:
Alx Sa
2025-03-18 05:48:57 +00:00
parent 4dfa4924ff
commit 20cf6d553a
2 changed files with 115 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
app/tools/gimpmoveoptions.c
View File

@@ -26,6 +26,10 @@
#include "tools-types.h"
#include "config/gimpguiconfig.h"
#include "core/gimp.h"
#include "widgets/gimpwidgets-utils.h"
#include "gimpmoveoptions.h"
@@ -42,14 +46,17 @@ enum
};
static void gimp_move_options_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec);
static void gimp_move_options_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec);
static void gimp_move_options_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec);
static void gimp_move_options_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec);
static void gimp_move_options_style_updated (GimpGuiConfig *config,
GParamSpec *pspec,
GtkWidget *box);
G_DEFINE_TYPE (GimpMoveOptions, gimp_move_options, GIMP_TYPE_TOOL_OPTIONS)
@@ -126,6 +133,35 @@ gimp_move_options_get_property (GObject *object,
}
}
static void
gimp_move_options_style_updated (GimpGuiConfig *config,
GParamSpec *pspec,
GtkWidget *box)
{
GtkIconSize icon_size = GTK_ICON_SIZE_MENU;
if (config->override_icon_size)
{
switch (config->custom_icon_size)
{
case GIMP_ICON_SIZE_LARGE:
icon_size = GTK_ICON_SIZE_LARGE_TOOLBAR;
break;
case GIMP_ICON_SIZE_HUGE:
icon_size = GTK_ICON_SIZE_DND;
break;
case GIMP_ICON_SIZE_MEDIUM:
case GIMP_ICON_SIZE_SMALL:
default:
icon_size = GTK_ICON_SIZE_MENU;
}
}
gimp_enum_icon_box_set_icon_size (box, icon_size);
}
static void
gimp_move_options_notify_type (GimpMoveOptions *move_options,
GParamSpec *pspec,
@@ -180,9 +216,11 @@ gimp_move_options_notify_type (GimpMoveOptions *move_options,
GtkWidget *
gimp_move_options_gui (GimpToolOptions *tool_options)
{
GObject *config = G_OBJECT (tool_options);
GimpMoveOptions *options = GIMP_MOVE_OPTIONS (tool_options);
GtkWidget *vbox = gimp_tool_options_gui (tool_options);
GObject *config = G_OBJECT (tool_options);
GimpContext *context = GIMP_CONTEXT (tool_options);
GimpGuiConfig *gui_config = GIMP_GUI_CONFIG (context->gimp->config);
GimpMoveOptions *options = GIMP_MOVE_OPTIONS (tool_options);
GtkWidget *vbox = gimp_tool_options_gui (tool_options);
GtkWidget *hbox;
GtkWidget *box;
GtkWidget *label;
@@ -205,6 +243,16 @@ gimp_move_options_gui (GimpToolOptions *tool_options)
gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0);
gtk_widget_show (box);
g_signal_connect_object (gui_config,
"notify::override-theme-icon-size",
G_CALLBACK (gimp_move_options_style_updated),
box, G_CONNECT_AFTER);
g_signal_connect_object (gui_config,
"notify::custom-icon-size",
G_CALLBACK (gimp_move_options_style_updated),
box, G_CONNECT_AFTER);
gimp_move_options_style_updated (gui_config, NULL, box);
/* tool toggle */
title =
g_strdup_printf (_("Tool Toggle (%s)"),

67
app/tools/gimptransformoptions.c
View File

@@ -27,6 +27,7 @@
#include "tools-types.h"
#include "config/gimpcoreconfig.h"
#include "config/gimpguiconfig.h"
#include "core/gimp.h"
#include "core/gimptoolinfo.h"
@@ -52,14 +53,17 @@ enum
static void gimp_transform_options_config_iface_init (GimpConfigInterface *config_iface);
static void gimp_transform_options_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec);
static void gimp_transform_options_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec);
static void gimp_transform_options_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec);
static void gimp_transform_options_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec);
static void gimp_transform_options_style_updated (GimpGuiConfig *config,
GParamSpec *pspec,
GtkWidget *box);
static void gimp_transform_options_reset (GimpConfig *config);
@@ -182,6 +186,35 @@ gimp_transform_options_get_property (GObject *object,
}
}
static void
gimp_transform_options_style_updated (GimpGuiConfig *config,
GParamSpec *pspec,
GtkWidget *box)
{
GtkIconSize icon_size = GTK_ICON_SIZE_MENU;
if (config->override_icon_size)
{
switch (config->custom_icon_size)
{
case GIMP_ICON_SIZE_LARGE:
icon_size = GTK_ICON_SIZE_LARGE_TOOLBAR;
break;
case GIMP_ICON_SIZE_HUGE:
icon_size = GTK_ICON_SIZE_DND;
break;
case GIMP_ICON_SIZE_MEDIUM:
case GIMP_ICON_SIZE_SMALL:
default:
icon_size = GTK_ICON_SIZE_MENU;
}
}
gimp_enum_icon_box_set_icon_size (box, icon_size);
}
static void
gimp_transform_options_reset (GimpConfig *config)
{
@@ -215,9 +248,11 @@ gimp_transform_options_gui (GimpToolOptions *tool_options,
gboolean interpolation,
gboolean clipping)
{
GObject *config = G_OBJECT (tool_options);
GimpTransformOptions *options = GIMP_TRANSFORM_OPTIONS (tool_options);
GtkWidget *vbox = gimp_tool_options_gui (tool_options);
GObject *config = G_OBJECT (tool_options);
GimpContext *context = GIMP_CONTEXT (tool_options);
GimpGuiConfig *gui_config = GIMP_GUI_CONFIG (context->gimp->config);
GimpTransformOptions *options = GIMP_TRANSFORM_OPTIONS (tool_options);
GtkWidget *vbox = gimp_tool_options_gui (tool_options);
GtkWidget *hbox;
GtkWidget *box;
GtkWidget *label;
@@ -237,6 +272,16 @@ gimp_transform_options_gui (GimpToolOptions *tool_options,
box = gimp_prop_enum_icon_box_new (config, "type", "gimp", 0, 0);
gtk_box_pack_start (GTK_BOX (hbox), box, FALSE, FALSE, 0);
g_signal_connect_object (gui_config,
"notify::override-theme-icon-size",
G_CALLBACK (gimp_transform_options_style_updated),
box, G_CONNECT_AFTER);
g_signal_connect_object (gui_config,
"notify::custom-icon-size",
G_CALLBACK (gimp_transform_options_style_updated),
box, G_CONNECT_AFTER);
gimp_transform_options_style_updated (gui_config, NULL, box);
if (direction)
{
frame = gimp_prop_enum_radio_frame_new (config, "direction", NULL,