graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-20 19:43:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

app: add function gimp_text_tool_editor_get_iter_index()

Browse source 
which returns the byte index at a GtkTextIter, and use it all over the
place.
This commit is contained in:
Michael Natterer 2010-02-24 00:18:50 +01:00
parent 14158b982a
commit 97db8b9b42
3 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
app/tools/gimptexttool-editor.c
View file

@ -453,6 +453,24 @@ gimp_text_tool_editor_get_text (GimpTextTool *text_tool)
&start, &end, TRUE);
}
gint
gimp_text_tool_editor_get_iter_index (GimpTextTool *text_tool,
GtkTextIter *iter)
{
GtkTextBuffer *buffer = text_tool->text_buffer;
GtkTextIter start;
gchar *string;
gint index;
gtk_text_buffer_get_start_iter (buffer, &start);
string = gtk_text_buffer_get_text (buffer, &start, iter, TRUE);
index = strlen (string);
g_free (string);
return index;
}
void
gimp_text_tool_editor_get_cursor_rect (GimpTextTool *text_tool,
PangoRectangle *cursor_rect,
@ -463,10 +481,8 @@ gimp_text_tool_editor_get_cursor_rect (GimpTextTool *text_tool,
PangoLayout *layout;
PangoRectangle ink_extents;
PangoRectangle logical_extents;
GtkTextIter start;
GtkTextIter cursor;
gint cursor_index;
gchar *string;
g_return_if_fail (GIMP_IS_TEXT_TOOL (text_tool));
g_return_if_fail (cursor_rect != NULL);
@ -488,13 +504,9 @@ gimp_text_tool_editor_get_cursor_rect (GimpTextTool *text_tool,
else
*logical_off_y = 0;
gtk_text_buffer_get_start_iter (buffer, &start);
gtk_text_buffer_get_iter_at_mark (buffer, &cursor,
gtk_text_buffer_get_insert (buffer));
string = gtk_text_buffer_get_text (buffer, &start, &cursor, TRUE);
cursor_index = strlen (string);
g_free (string);
cursor_index = gimp_text_tool_editor_get_iter_index (text_tool, &cursor);
pango_layout_index_to_pos (layout, cursor_index, cursor_rect);
gimp_text_layout_transform_rect (text_tool->layout, cursor_rect);
@ -659,9 +671,8 @@ gimp_text_tool_move_cursor (GimpTextTool *text_tool,
gtk_text_buffer_get_bounds (buffer, &start, &end);
string = gtk_text_buffer_get_text (buffer, &start, &cursor, TRUE);
cursor_index = strlen (string);
g_free (string);
cursor_index = gimp_text_tool_editor_get_iter_index (text_tool,
&cursor);
gimp_text_tool_ensure_layout (text_tool);

3
app/tools/gimptexttool-editor.h
View file

@ -47,6 +47,9 @@ void gimp_text_tool_reset_im_context (GimpTextTool *text_tool
gchar * gimp_text_tool_editor_get_text (GimpTextTool *text_tool);
gint gimp_text_tool_editor_get_iter_index (GimpTextTool *text_tool,
GtkTextIter *iter);
void gimp_text_tool_editor_get_cursor_rect (GimpTextTool *text_tool,
PangoRectangle *cursor_rect,
gint *logical_off_x,

12
app/tools/gimptexttool.c
View file

@ -753,22 +753,14 @@ gimp_text_tool_draw_selection (GimpDrawTool *draw_tool,
GtkTextBuffer *buffer = text_tool->text_buffer;
PangoLayout *layout;
PangoLayoutIter *iter;
GtkTextIter start;
GtkTextIter sel_start, sel_end;
gint min, max;
gchar *string;
gint i;
gtk_text_buffer_get_start_iter (buffer, &start);
gtk_text_buffer_get_selection_bounds (buffer, &sel_start, &sel_end);
string = gtk_text_buffer_get_text (buffer, &start, &sel_start, FALSE);
min = strlen (string);
g_free (string);
string = gtk_text_buffer_get_text (buffer, &start, &sel_end, FALSE);
max = strlen (string);
g_free (string);
min = gimp_text_tool_editor_get_iter_index (text_tool, &sel_start);
max = gimp_text_tool_editor_get_iter_index (text_tool, &sel_end);
layout = gimp_text_layout_get_pango_layout (text_tool->layout);