diff options
| author | Christian Persch <chpe@src.gnome.org> | 2009-03-02 20:14:07 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2009-03-02 20:14:07 +0000 |
| commit | 03aeb31b699fc253ccd9cd883328306eee8f2f1d (patch) | |
| tree | 33bf36cba69241671a26722a9b0cee90754a21d9 | |
| parent | fa84c74627c951e3366f7b76298bfdb5208e5c65 (diff) | |
| download | vte-03aeb31b699fc253ccd9cd883328306eee8f2f1d.tar.gz | |
Correct use of padding returned by vte_terminal_get_padding().
* src/vteaccess.c: (vte_terminal_accessible_set_size),
(vte_terminal_accessible_ref_accessible_at_point):
* src/vteapp.c: (button_pressed): Correct use of padding returned
by vte_terminal_get_padding().
svn path=/trunk/; revision=2376
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/vteaccess.c | 12 | ||||
| -rw-r--r-- | src/vteapp.c | 4 |
3 files changed, 11 insertions, 12 deletions
@@ -1,5 +1,12 @@ 2009-03-02 Christian Persch <chpe@gnome.org> + * src/vteaccess.c: (vte_terminal_accessible_set_size), + (vte_terminal_accessible_ref_accessible_at_point): + * src/vteapp.c: (button_pressed): Correct use of padding returned + by vte_terminal_get_padding(). + +2009-03-02 Christian Persch <chpe@gnome.org> + * src/vte.c: (vte_terminal_refresh_size), (vte_terminal_set_size): Use g_strerror() instead of strerror(). diff --git a/src/vteaccess.c b/src/vteaccess.c index aeb50e19..8e5f592f 100644 --- a/src/vteaccess.c +++ b/src/vteaccess.c @@ -1775,16 +1775,8 @@ vte_terminal_accessible_set_size(AtkComponent *component, vte_terminal_get_padding(terminal, &xpad, &ypad); /* If the size is an exact multiple of the cell size, use that, * otherwise round down. */ - if (width % terminal->char_width == 0) { - columns = width / terminal->char_width; - } else { - columns = (width + xpad) / terminal->char_width; - } - if (height % terminal->char_height == 0) { - rows = height / terminal->char_height; - } else { - rows = (height + xpad) / terminal->char_height; - } + columns = (width - xpad) / terminal->char_width; + rows = (height - ypad) / terminal->char_height; vte_terminal_set_size(terminal, columns, rows); return (terminal->row_count == rows) && (terminal->column_count == columns); diff --git a/src/vteapp.c b/src/vteapp.c index 578038e9..4d62e67b 100644 --- a/src/vteapp.c +++ b/src/vteapp.c @@ -174,9 +174,9 @@ button_pressed(GtkWidget *widget, GdkEventButton *event, gpointer data) terminal = VTE_TERMINAL(widget); vte_terminal_get_padding(terminal, &xpad, &ypad); match = vte_terminal_match_check(terminal, - (event->x - ypad) / + (event->x - xpad / 2) / terminal->char_width, - (event->y - ypad) / + (event->y - ypad / 2) / terminal->char_height, &tag); if (match != NULL) { |