mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

editor: take text offset into account when computing cursor position

Browse Source
This commit is contained in:
Philipp Brüschweiler
2012-10-02 11:06:53 +02:00
committed by Kristian Høgsberg
parent b8911dcdd7
commit 9f897c7a5f
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/editor.c
+9 -7
View File
@@ -700,6 +700,8 @@ text_entry_draw_preedit(struct text_entry *entry, cairo_t *cr)
cairo_restore (cr); cairo_restore (cr);
} }
static const int text_offset_left = 10;
static void static void
text_entry_redraw_handler(struct widget *widget, void *data) text_entry_redraw_handler(struct widget *widget, void *data)
{ {
@@ -735,7 +737,7 @@ text_entry_redraw_handler(struct widget *widget, void *data)
cairo_set_source_rgba(cr, 0, 0, 0, 1); cairo_set_source_rgba(cr, 0, 0, 0, 1);
cairo_translate(cr, 10, allocation.height / 2); cairo_translate(cr, text_offset_left, allocation.height / 2);
text_layout_draw(entry->layout, cr); text_layout_draw(entry->layout, cr);
text_entry_draw_selection(entry, cr); text_entry_draw_selection(entry, cr);
@@ -762,8 +764,8 @@ text_entry_motion_handler(struct widget *widget,
widget_get_allocation(entry->widget, &allocation); widget_get_allocation(entry->widget, &allocation);
text_entry_set_cursor_position(entry, text_entry_set_cursor_position(entry,
x - allocation.x, x - allocation.x - text_offset_left,
y - allocation.y); y - allocation.y - text_offset_left);
return CURSOR_IBEAM; return CURSOR_IBEAM;
} }
@@ -786,8 +788,8 @@ text_entry_button_handler(struct widget *widget,
} }
text_entry_set_cursor_position(entry, text_entry_set_cursor_position(entry,
x - allocation.x, x - allocation.x - text_offset_left,
y - allocation.y); y - allocation.y - text_offset_left);
if (state == WL_POINTER_BUTTON_STATE_PRESSED) { if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
struct wl_seat *seat = input_get_seat(input); struct wl_seat *seat = input_get_seat(input);
@@ -795,8 +797,8 @@ text_entry_button_handler(struct widget *widget,
text_entry_activate(entry, seat); text_entry_activate(entry, seat);
text_entry_set_anchor_position(entry, text_entry_set_anchor_position(entry,
x - allocation.x, x - allocation.x - text_offset_left,
y - allocation.y); y - allocation.y - text_offset_left);
widget_set_motion_handler(entry->widget, text_entry_motion_handler); widget_set_motion_handler(entry->widget, text_entry_motion_handler);
} else { } else {