callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: add compact style for spin scales

Browse Source 
Add a boolean "compact" style property for GimpSpinScale.  When
TRUE, the widget uses a narrower layout, and the different upper/
lower-half behavior is gone.  Instead, the behavior depends on the
mouse button used: left-click is used for absolute adjustment
(similar to the upper-half behavior), middle-click is used for
relative adjustment (similar to the lower-half behavior), and right
click is used for manual value entry (similar for clicking on the
text area).

Add a new "Compact sliders" toggle to the Interface prefernces, to
control the spin-scale style.  Apply the style globally through the
themerc file, and update it when the option changes.

Use the compact style by default, because otherwise no one would
find it.  Theming in GTK3 works differently, and spin scales in
master need more work regardless, so this stays in 2.10 for now.
This commit is contained in:
Ell
2020-01-06 22:44:44 +02:00
parent 3d7bb4bc3d
commit 8591b5b33f
6 changed files with 135 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/gui/themes.c
View File

@ -41,8 +41,11 @@
/* local function prototypes */
static void themes_write_style (GimpGuiConfig *config,
GOutputStream *output,
GError **error);
static void themes_apply_theme (Gimp *gimp,
const gchar *theme_name);
GimpGuiConfig *config);
static void themes_list_themes_foreach (gpointer key,
gpointer value,
gpointer data);
@ -143,7 +146,7 @@ themes_init (Gimp *gimp)
g_list_free_full (path, (GDestroyNotify) g_object_unref);
}
themes_apply_theme (gimp, config->theme);
themes_apply_theme (gimp, config);
themerc = gimp_personal_rc_file ("themerc");
gtk_rc_parse (themerc);
@ -154,6 +157,9 @@ themes_init (Gimp *gimp)
g_signal_connect (config, "notify::theme",
G_CALLBACK (themes_theme_change_notify),
gimp);
g_signal_connect (config, "notify::compact-sliders",
G_CALLBACK (themes_theme_change_notify),
gimp);
}
void
@ -272,8 +278,28 @@ themes_get_theme_file (Gimp *gimp,
/* private functions */
static void
themes_apply_theme (Gimp *gimp,
const gchar *theme_name)
themes_write_style (GimpGuiConfig *config,
GOutputStream *output,
GError **error)
{
if (! *error)
{
g_output_stream_printf (
output, NULL, NULL, error,
"style \"gimp-spin-scale-style\"\n"
"{\n"
" GimpSpinScale::compact = %d\n"
"}\n"
"\n"
"class \"GimpSpinScale\" style \"gimp-spin-scale-style\"\n"
"\n",
config->compact_sliders);
}
}
static void
themes_apply_theme (Gimp *gimp,
GimpGuiConfig *config)
{
GFile *themerc;
GOutputStream *output;
@ -296,7 +322,7 @@ themes_apply_theme (Gimp *gimp,
}
else
{
GFile *theme_dir = themes_get_theme_dir (gimp, theme_name);
GFile *theme_dir = themes_get_theme_dir (gimp, config->theme);
GFile *gtkrc_user;
GSList *gtkrc_files = NULL;
GSList *iter;
@ -336,6 +362,8 @@ themes_apply_theme (Gimp *gimp,
"\n",
gimp_file_get_utf8_name (gtkrc_user));
themes_write_style (config, output, &error);
for (iter = gtkrc_files; ! error && iter; iter = g_slist_next (iter))
{
GFile *file = iter->data;
@ -419,7 +447,7 @@ themes_theme_change_notify (GimpGuiConfig *config,
GParamSpec *pspec,
Gimp *gimp)
{
themes_apply_theme (gimp, config->theme);
themes_apply_theme (gimp, config);
gtk_rc_reparse_all ();