s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into a11y

Browse Source 
Conflicts:
	eek/eek-gtk-keyboard.c
This commit is contained in:
Daiki Ueno
2010-08-05 12:38:01 +09:00
parent 65c1abbe27 039ea44520
commit 08e1a6c69a
10 changed files with 143 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
eek/eek-gtk-keyboard.c
View File

@ -492,23 +492,15 @@ on_button_event (GtkWidget *widget,
GdkEventButton *event,
gpointer user_data)
{
EekElement *keyboard = user_data, *section, *key;
EekGtkKeyboard *keyboard = EEK_GTK_KEYBOARD(user_data), *key;
EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(keyboard);
EekBounds bounds;
gdouble x, y;
x = (gdouble)event->x / priv->scale;
y = (gdouble)event->y / priv->scale;
section = eek_container_find_by_position (EEK_CONTAINER(keyboard), x, y);
if (section) {
eek_element_get_bounds (keyboard, &bounds);
x -= bounds.x;
y -= bounds.y;
key = eek_container_find_by_position (EEK_CONTAINER(section),
x,
y);
if (!key)
return FALSE;
key = eek_keyboard_find_key_by_position (EEK_KEYBOARD(keyboard), x, y);
if (key)
switch (event->type) {
case GDK_BUTTON_PRESS:
press_key (EEK_GTK_KEYBOARD(keyboard), EEK_KEY(key));
@ -519,7 +511,6 @@ on_button_event (GtkWidget *widget,
default:
return FALSE;
}
}
return FALSE;
}