[gimp] app: add baseline and kerning controls to the style editor overlay
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: add baseline and kerning controls to the style editor overlay
- Date: Thu, 4 Mar 2010 20:37:33 +0000 (UTC)
commit f76621554869cdb741f027b9c2f223db5712a34a
Author: Michael Natterer <mitch gimp org>
Date: Thu Mar 4 14:19:37 2010 +0100
app: add baseline and kerning controls to the style editor overlay
Involves adding GimpTextBuffer API to *set* baseline and kerning (as
opposed to changing it relatively from what it was).
app/widgets/gimptextbuffer.c | 72 +++++++++++
app/widgets/gimptextbuffer.h | 8 ++
app/widgets/gimptextstyleeditor.c | 253 ++++++++++++++++++++++++++++++-------
app/widgets/gimptextstyleeditor.h | 6 +
4 files changed, 295 insertions(+), 44 deletions(-)
---
diff --git a/app/widgets/gimptextbuffer.c b/app/widgets/gimptextbuffer.c
index 6b9f38e..7dd1a8e 100644
--- a/app/widgets/gimptextbuffer.c
+++ b/app/widgets/gimptextbuffer.c
@@ -387,6 +387,42 @@ gimp_text_buffer_get_baseline_tag (GimpTextBuffer *buffer,
}
void
+gimp_text_buffer_set_baseline (GimpTextBuffer *buffer,
+ const GtkTextIter *start,
+ const GtkTextIter *end,
+ gint baseline)
+{
+ GList *list;
+
+ g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+ g_return_if_fail (start != NULL);
+ g_return_if_fail (end != NULL);
+
+ if (gtk_text_iter_equal (start, end))
+ return;
+
+ gtk_text_buffer_begin_user_action (GTK_TEXT_BUFFER (buffer));
+
+ for (list = buffer->baseline_tags; list; list = g_list_next (list))
+ {
+ gtk_text_buffer_remove_tag (GTK_TEXT_BUFFER (buffer), list->data,
+ start, end);
+ }
+
+ if (baseline != 0)
+ {
+ GtkTextTag *tag;
+
+ tag = gimp_text_buffer_get_baseline_tag (buffer, baseline);
+
+ gtk_text_buffer_apply_tag (GTK_TEXT_BUFFER (buffer), tag,
+ start, end);
+ }
+
+ gtk_text_buffer_end_user_action (GTK_TEXT_BUFFER (buffer));
+}
+
+void
gimp_text_buffer_change_baseline (GimpTextBuffer *buffer,
const GtkTextIter *start,
const GtkTextIter *end,
@@ -519,6 +555,42 @@ gimp_text_buffer_get_kerning_tag (GimpTextBuffer *buffer,
}
void
+gimp_text_buffer_set_kerning (GimpTextBuffer *buffer,
+ const GtkTextIter *start,
+ const GtkTextIter *end,
+ gint kerning)
+{
+ GList *list;
+
+ g_return_if_fail (GIMP_IS_TEXT_BUFFER (buffer));
+ g_return_if_fail (start != NULL);
+ g_return_if_fail (end != NULL);
+
+ if (gtk_text_iter_equal (start, end))
+ return;
+
+ gtk_text_buffer_begin_user_action (GTK_TEXT_BUFFER (buffer));
+
+ for (list = buffer->kerning_tags; list; list = g_list_next (list))
+ {
+ gtk_text_buffer_remove_tag (GTK_TEXT_BUFFER (buffer), list->data,
+ start, end);
+ }
+
+ if (kerning != 0)
+ {
+ GtkTextTag *tag;
+
+ tag = gimp_text_buffer_get_kerning_tag (buffer, kerning);
+
+ gtk_text_buffer_apply_tag (GTK_TEXT_BUFFER (buffer), tag,
+ start, end);
+ }
+
+ gtk_text_buffer_end_user_action (GTK_TEXT_BUFFER (buffer));
+}
+
+void
gimp_text_buffer_change_kerning (GimpTextBuffer *buffer,
const GtkTextIter *start,
const GtkTextIter *end,
diff --git a/app/widgets/gimptextbuffer.h b/app/widgets/gimptextbuffer.h
index ac3abf7..97425cc 100644
--- a/app/widgets/gimptextbuffer.h
+++ b/app/widgets/gimptextbuffer.h
@@ -74,6 +74,10 @@ gboolean gimp_text_buffer_has_markup (GimpTextBuffer *buffer);
GtkTextTag * gimp_text_buffer_get_iter_baseline (GimpTextBuffer *buffer,
const GtkTextIter *iter,
gint *baseline);
+void gimp_text_buffer_set_baseline (GimpTextBuffer *buffer,
+ const GtkTextIter *start,
+ const GtkTextIter *end,
+ gint count);
void gimp_text_buffer_change_baseline (GimpTextBuffer *buffer,
const GtkTextIter *start,
const GtkTextIter *end,
@@ -82,6 +86,10 @@ void gimp_text_buffer_change_baseline (GimpTextBuffer *buffer,
GtkTextTag * gimp_text_buffer_get_iter_kerning (GimpTextBuffer *buffer,
const GtkTextIter *iter,
gint *kerning);
+void gimp_text_buffer_set_kerning (GimpTextBuffer *buffer,
+ const GtkTextIter *start,
+ const GtkTextIter *end,
+ gint count);
void gimp_text_buffer_change_kerning (GimpTextBuffer *buffer,
const GtkTextIter *start,
const GtkTextIter *end,
diff --git a/app/widgets/gimptextstyleeditor.c b/app/widgets/gimptextstyleeditor.c
index ed43cc0..52bf594 100644
--- a/app/widgets/gimptextstyleeditor.c
+++ b/app/widgets/gimptextstyleeditor.c
@@ -52,35 +52,51 @@ enum
};
-static GObject * gimp_text_style_editor_constructor (GType type,
- guint n_params,
- GObjectConstructParam *params);
-static void gimp_text_style_editor_dispose (GObject *object);
-static void gimp_text_style_editor_finalize (GObject *object);
-static void gimp_text_style_editor_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec);
-static void gimp_text_style_editor_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec);
-
-static GtkWidget *
- gimp_text_style_editor_create_toggle (GimpTextStyleEditor *editor,
- GtkTextTag *tag,
- const gchar *stock_id);
-
-static void gimp_text_style_editor_clear_tags (GtkButton *button,
- GimpTextStyleEditor *editor);
-static void gimp_text_style_editor_font_changed (GimpContext *context,
- GimpFont *font,
- GimpTextStyleEditor *editor);
-static void gimp_text_style_editor_tag_toggled (GtkToggleButton *toggle,
- GimpTextStyleEditor *editor);
-
-static void gimp_text_style_editor_update (GimpTextStyleEditor *editor);
-static gboolean gimp_text_style_editor_update_idle (GimpTextStyleEditor *editor);
+static GObject * gimp_text_style_editor_constructor (GType type,
+ guint n_params,
+ GObjectConstructParam *params);
+static void gimp_text_style_editor_dispose (GObject *object);
+static void gimp_text_style_editor_finalize (GObject *object);
+static void gimp_text_style_editor_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gimp_text_style_editor_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
+
+static GtkWidget * gimp_text_style_editor_create_toggle (GimpTextStyleEditor *editor,
+ GtkTextTag *tag,
+ const gchar *stock_id);
+
+static void gimp_text_style_editor_clear_tags (GtkButton *button,
+ GimpTextStyleEditor *editor);
+
+static void gimp_text_style_editor_font_changed (GimpContext *context,
+ GimpFont *font,
+ GimpTextStyleEditor *editor);
+static void gimp_text_style_editor_set_font (GimpTextStyleEditor *editor,
+ GtkTextTag *font_tag);
+
+static void gimp_text_style_editor_tag_toggled (GtkToggleButton *toggle,
+ GimpTextStyleEditor *editor);
+static void gimp_text_style_editor_set_toggle (GimpTextStyleEditor *editor,
+ GtkToggleButton *toggle,
+ gboolean active);
+
+static void gimp_text_style_editor_baseline_changed (GtkAdjustment *adjustment,
+ GimpTextStyleEditor *editor);
+static void gimp_text_style_editor_set_baseline (GimpTextStyleEditor *editor,
+ gint baseline);
+
+static void gimp_text_style_editor_kerning_changed (GtkAdjustment *adjustment,
+ GimpTextStyleEditor *editor);
+static void gimp_text_style_editor_set_kerning (GimpTextStyleEditor *editor,
+ gint kerning);
+
+static void gimp_text_style_editor_update (GimpTextStyleEditor *editor);
+static gboolean gimp_text_style_editor_update_idle (GimpTextStyleEditor *editor);
G_DEFINE_TYPE (GimpTextStyleEditor, gimp_text_style_editor,
@@ -178,6 +194,32 @@ gimp_text_style_editor_init (GimpTextStyleEditor *editor)
gtk_misc_set_padding (GTK_MISC (editor->size_label), 2, 0);
gtk_box_pack_end (GTK_BOX (editor), editor->size_label, FALSE, FALSE, 0);
gtk_widget_show (editor->size_label);
+
+ editor->kerning_adjustment =
+ GTK_ADJUSTMENT (gtk_adjustment_new (0.0, -1000.0, 1000.0, 1.0, 10.0, 0.0));
+ editor->kerning_spinbutton = gtk_spin_button_new (editor->kerning_adjustment,
+ 1.0, 1);
+ gtk_entry_set_width_chars (GTK_ENTRY (editor->kerning_spinbutton), 5);
+ gtk_box_pack_end (GTK_BOX (editor), editor->kerning_spinbutton,
+ FALSE, FALSE, 0);
+ gtk_widget_show (editor->kerning_spinbutton);
+
+ g_signal_connect (editor->kerning_adjustment, "value-changed",
+ G_CALLBACK (gimp_text_style_editor_kerning_changed),
+ editor);
+
+ editor->baseline_adjustment =
+ GTK_ADJUSTMENT (gtk_adjustment_new (0.0, -1000.0, 1000.0, 1.0, 10.0, 0.0));
+ editor->baseline_spinbutton = gtk_spin_button_new (editor->baseline_adjustment,
+ 1.0, 1);
+ gtk_entry_set_width_chars (GTK_ENTRY (editor->baseline_spinbutton), 5);
+ gtk_box_pack_end (GTK_BOX (editor), editor->baseline_spinbutton,
+ FALSE, FALSE, 0);
+ gtk_widget_show (editor->baseline_spinbutton);
+
+ g_signal_connect (editor->baseline_adjustment, "value-changed",
+ G_CALLBACK (gimp_text_style_editor_baseline_changed),
+ editor);
}
static GObject *
@@ -475,6 +517,30 @@ gimp_text_style_editor_font_changed (GimpContext *context,
}
static void
+gimp_text_style_editor_set_font (GimpTextStyleEditor *editor,
+ GtkTextTag *font_tag)
+{
+ gchar *font = NULL;
+
+ if (font_tag)
+ g_object_get (font_tag,
+ "font", &font,
+ NULL);
+
+ g_signal_handlers_block_by_func (editor->context,
+ gimp_text_style_editor_font_changed,
+ editor);
+
+ gimp_context_set_font_name (editor->context, font);
+
+ g_signal_handlers_unblock_by_func (editor->context,
+ gimp_text_style_editor_font_changed,
+ editor);
+
+ g_free (font);
+}
+
+static void
gimp_text_style_editor_tag_toggled (GtkToggleButton *toggle,
GimpTextStyleEditor *editor)
{
@@ -524,27 +590,78 @@ gimp_text_style_editor_set_toggle (GimpTextStyleEditor *editor,
}
static void
-gimp_text_style_editor_set_font (GimpTextStyleEditor *editor,
- GtkTextTag *font_tag)
+gimp_text_style_editor_baseline_changed (GtkAdjustment *adjustment,
+ GimpTextStyleEditor *editor)
{
- gchar *font = NULL;
+ GtkTextBuffer *buffer = GTK_TEXT_BUFFER (editor->buffer);
+ GtkTextIter start, end;
- if (font_tag)
- g_object_get (font_tag,
- "font", &font,
- NULL);
+ if (! gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
+ {
+ gtk_text_buffer_get_iter_at_mark (buffer, &start,
+ gtk_text_buffer_get_insert (buffer));
+ gtk_text_buffer_get_end_iter (buffer, &end);
+ }
- g_signal_handlers_block_by_func (editor->context,
- gimp_text_style_editor_font_changed,
+ gimp_text_buffer_set_baseline (editor->buffer, &start, &end,
+ gtk_adjustment_get_value (adjustment) *
+ PANGO_SCALE);
+}
+
+static void
+gimp_text_style_editor_set_baseline (GimpTextStyleEditor *editor,
+ gint baseline)
+{
+ g_signal_handlers_block_by_func (editor->baseline_adjustment,
+ gimp_text_style_editor_baseline_changed,
editor);
- gimp_context_set_font_name (editor->context, font);
+ gtk_adjustment_set_value (editor->baseline_adjustment,
+ (gdouble) baseline / PANGO_SCALE);
+ /* make sure the "" really gets replaced */
+ gtk_adjustment_value_changed (editor->baseline_adjustment);
- g_signal_handlers_unblock_by_func (editor->context,
- gimp_text_style_editor_font_changed,
+ g_signal_handlers_unblock_by_func (editor->baseline_adjustment,
+ gimp_text_style_editor_baseline_changed,
editor);
+}
- g_free (font);
+static void
+gimp_text_style_editor_kerning_changed (GtkAdjustment *adjustment,
+ GimpTextStyleEditor *editor)
+{
+ GtkTextBuffer *buffer = GTK_TEXT_BUFFER (editor->buffer);
+ GtkTextIter start, end;
+
+ if (! gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
+ {
+ gtk_text_buffer_get_iter_at_mark (buffer, &start,
+ gtk_text_buffer_get_insert (buffer));
+ end = start;
+ gtk_text_iter_forward_char (&end);
+ }
+
+ gimp_text_buffer_set_kerning (editor->buffer, &start, &end,
+ gtk_adjustment_get_value (adjustment) *
+ PANGO_SCALE);
+}
+
+static void
+gimp_text_style_editor_set_kerning (GimpTextStyleEditor *editor,
+ gint kerning)
+{
+ g_signal_handlers_block_by_func (editor->kerning_adjustment,
+ gimp_text_style_editor_kerning_changed,
+ editor);
+
+ gtk_adjustment_set_value (editor->kerning_adjustment,
+ (gdouble) kerning / PANGO_SCALE);
+ /* make sure the "" really gets replaced */
+ gtk_adjustment_value_changed (editor->kerning_adjustment);
+
+ g_signal_handlers_unblock_by_func (editor->kerning_adjustment,
+ gimp_text_style_editor_kerning_changed,
+ editor);
}
static void
@@ -576,7 +693,11 @@ gimp_text_style_editor_update_idle (GimpTextStyleEditor *editor)
GList *list;
gboolean any_toggle_active = TRUE;
gboolean font_differs = FALSE;
+ gboolean baseline_differs = FALSE;
+ gboolean kerning_differs = FALSE;
GtkTextTag *font_tag = NULL;
+ gint baseline;
+ gint kerning;
gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
gtk_text_iter_order (&start, &end);
@@ -589,8 +710,10 @@ gimp_text_style_editor_update_idle (GimpTextStyleEditor *editor)
gimp_text_style_editor_set_toggle (editor, toggle, TRUE);
}
- /* and get the initial font tag */
+ /* and get some initial values */
font_tag = gimp_text_buffer_get_iter_font (editor->buffer, &start, NULL);
+ gimp_text_buffer_get_iter_baseline (editor->buffer, &start, &baseline);
+ gimp_text_buffer_get_iter_kerning (editor->buffer, &start, &kerning);
for (iter = start;
gtk_text_iter_in_range (&iter, &start, &end);
@@ -628,7 +751,32 @@ gimp_text_style_editor_update_idle (GimpTextStyleEditor *editor)
font_differs = TRUE;
}
- if (! any_toggle_active && font_differs)
+ if (! baseline_differs)
+ {
+ gint tag_baseline;
+
+ gimp_text_buffer_get_iter_baseline (editor->buffer, &iter,
+ &tag_baseline);
+
+ if (baseline != tag_baseline)
+ baseline_differs = TRUE;
+ }
+
+ if (! kerning_differs)
+ {
+ gint tag_kerning;
+
+ gimp_text_buffer_get_iter_kerning (editor->buffer, &iter,
+ &tag_kerning);
+
+ if (kerning != tag_kerning)
+ kerning_differs = TRUE;
+ }
+
+ if (! any_toggle_active &&
+ font_differs &&
+ baseline_differs &&
+ kerning_differs)
break;
}
@@ -637,6 +785,16 @@ gimp_text_style_editor_update_idle (GimpTextStyleEditor *editor)
gimp_text_style_editor_set_font (editor, font_tag);
+ if (baseline_differs)
+ gtk_entry_set_text (GTK_ENTRY (editor->baseline_spinbutton), "");
+ else
+ gimp_text_style_editor_set_baseline (editor, baseline);
+
+ if (kerning_differs)
+ gtk_entry_set_text (GTK_ENTRY (editor->kerning_spinbutton), "");
+ else
+ gimp_text_style_editor_set_kerning (editor, kerning);
+
gtk_label_set_text (GTK_LABEL (editor->size_label), "---");
}
else
@@ -647,6 +805,7 @@ gimp_text_style_editor_update_idle (GimpTextStyleEditor *editor)
GSList *tags_off;
GList *list;
gchar *str;
+ gint value;
gtk_text_buffer_get_iter_at_mark (buffer, &cursor,
gtk_text_buffer_get_insert (buffer));
@@ -683,6 +842,12 @@ gimp_text_style_editor_update_idle (GimpTextStyleEditor *editor)
g_slist_find (tags_off, tag));
}
+ gimp_text_buffer_get_iter_baseline (editor->buffer, &cursor, &value);
+ gimp_text_style_editor_set_baseline (editor, value);
+
+ gimp_text_buffer_get_iter_kerning (editor->buffer, &cursor, &value);
+ gimp_text_style_editor_set_kerning (editor, value);
+
str = g_strdup_printf ("%0.2f", editor->resolution_y);
gtk_label_set_text (GTK_LABEL (editor->size_label), str);
g_free (str);
diff --git a/app/widgets/gimptextstyleeditor.h b/app/widgets/gimptextstyleeditor.h
index 98953ff..4c6806d 100644
--- a/app/widgets/gimptextstyleeditor.h
+++ b/app/widgets/gimptextstyleeditor.h
@@ -52,6 +52,12 @@ struct _GimpTextStyleEditor
GtkWidget *underline_toggle;
GtkWidget *strikethrough_toggle;
+ GtkWidget *baseline_spinbutton;
+ GtkAdjustment *baseline_adjustment;
+
+ GtkWidget *kerning_spinbutton;
+ GtkAdjustment *kerning_adjustment;
+
GtkWidget *size_label;
GList *toggles;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
