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

Move button finding to view

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2019-08-16 17:14:36 +00:00
parent c9a580dc07
commit 4e9a8e4afe
5 changed files with 46 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -498,7 +498,7 @@ on_button_pressed (struct squeek_button *button,
struct button_place place = {
.button = button,
.row = eek_keyboard_get_row(view, button),
.row = squeek_view_get_row(view, button),
};
if (!place.row) {
return;

20
eek/eek-keyboard.c
View File

@ -294,26 +294,6 @@ struct GetRowData {
struct squeek_key *needle;
};
void find_button_in_row(struct squeek_row *row, gpointer user_data) {
struct GetRowData *data = user_data;
if (data->row) {
return;
}
if (squeek_row_contains(row, data->button)) {
data->row = row;
}
}
struct squeek_row *eek_keyboard_get_row(struct squeek_view *view,
struct squeek_button *button) {
struct GetRowData data = {
.button = button,
.row = NULL,
};
squeek_view_foreach(view, find_button_in_row, &data);
return data.row;
}
void find_key_in_row(struct squeek_row *row, gpointer user_data) {
struct GetRowData *data = user_data;
if (data->button) {

2
eek/eek-keyboard.h
View File

@ -61,8 +61,6 @@ struct _LevelKeyboard {
};
typedef struct _LevelKeyboard LevelKeyboard;
struct squeek_row *eek_keyboard_get_row(struct squeek_view *view,
struct squeek_button *button);
struct squeek_button *eek_keyboard_find_button_by_name(LevelKeyboard *keyboard,
const gchar *name);