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

Issue #3025 - "File/New" doesn't honor "precision" choice ...

Browse Source 
... for "Edit/Preferences/Default Image"

In GimpTemplateEditor, don't use gimp_prop_enum_combo_box_new() for
the "Precision" combo-box, and rather synchronize the combo-box and
the template manually, since we only want to update the "Gamma"
combo-box according to the precision when it changes through the
UI, and not when the template's precision otherwise changes.

This fixes an issue where we'd always set the default gamma value
when resetting the editor's template, overwriting the template's
original gamma value.
This commit is contained in:
Ell
2019-03-31 14:54:30 -04:00
parent 79225868e2
commit 033082dd9a
1 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/widgets/gimptemplateeditor.c
View File

@ -31,6 +31,8 @@
#include "config/gimpcoreconfig.h"
#include "gegl/gimp-babl.h"
#include "core/gimp.h"
#include "core/gimptemplate.h"
@ -71,6 +73,7 @@ struct _GimpTemplateEditorPrivate
GtkWidget *more_label;
GtkWidget *resolution_se;
GtkWidget *chain_button;
GtkWidget *precision_combo;
GtkWidget *profile_combo;
};
@ -157,6 +160,7 @@ gimp_template_editor_constructed (GObject *object)
GtkWidget *scrolled_window;
GtkWidget *text_view;
GtkTextBuffer *text_buffer;
GtkListStore *store;
GList *focus_chain = NULL;
gchar *text;
gint row;
@ -387,15 +391,28 @@ gimp_template_editor_constructed (GObject *object)
_("Color _space:"), 0.0, 0.5,
combo, 1);
combo = gimp_prop_enum_combo_box_new (G_OBJECT (template),
"component-type",
/* construct the precision combo manually, instead of using
* gimp_prop_enum_combo_box_new(), so that we only reset the gamma combo when
* the precision is changed through the ui. see issue #3025.
*/
store = gimp_enum_store_new_with_range (GIMP_TYPE_COMPONENT_TYPE,
GIMP_COMPONENT_TYPE_U8,
GIMP_COMPONENT_TYPE_FLOAT);
private->precision_combo = g_object_new (GIMP_TYPE_ENUM_COMBO_BOX,
"model", store,
NULL);
g_object_unref (store);
gimp_grid_attach_aligned (GTK_GRID (grid), 0, row++,
_("_Precision:"), 0.0, 0.5,
combo, 1);
private->precision_combo, 1);
g_signal_connect (combo, "changed",
gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (private->precision_combo),
gimp_babl_component_type (
gimp_template_get_precision (template)));
g_signal_connect (private->precision_combo, "changed",
G_CALLBACK (gimp_template_editor_precision_changed),
editor);
@ -617,6 +634,10 @@ gimp_template_editor_precision_changed (GtkWidget *widget,
gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (widget),
(gint *) &component_type);
g_object_set (private->template,
"component-type", component_type,
NULL);
/* when changing this logic, also change the same switch()
* in convert-precision-dialog.c
*/
@ -738,6 +759,20 @@ gimp_template_editor_template_notify (GimpTemplate *template,
gimp_template_get_resolution_y (template),
FALSE);
}
else if (! strcmp (param_spec->name, "component-type"))
{
g_signal_handlers_block_by_func (private->precision_combo,
gimp_template_editor_precision_changed,
editor);
gimp_int_combo_box_set_active (
GIMP_INT_COMBO_BOX (private->precision_combo),
gimp_babl_component_type (gimp_template_get_precision (template)));
g_signal_handlers_unblock_by_func (private->precision_combo,
gimp_template_editor_precision_changed,
editor);
}
}
#ifdef ENABLE_MEMSIZE_LABEL