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

keystate: Removed multiple symbols

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2019-08-13 18:42:42 +00:00
parent eb118d67fc
commit 996f681e5c
6 changed files with 38 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
eek/eek-key.c
View File

@ -186,11 +186,10 @@ eek_key_get_keycode (EekKey *key)
*/
struct squeek_symbol*
eek_key_get_symbol_at_index (EekKey *key,
gint group,
guint level)
gint group)
{
EekKeyPrivate *priv = eek_key_get_instance_private (key);
return squeek_key_get_symbol(priv->state, level);
return squeek_key_get_symbol(priv->state);
}
/**

3
eek/eek-key.h
View File

@ -55,8 +55,7 @@ void eek_key_set_keycode (EekKey *key,
guint eek_key_get_keycode (EekKey *key);
struct squeek_key *eek_key_get_state(EekKey *key);
struct squeek_symbol *eek_key_get_symbol_at_index (EekKey *key,
gint group,
guint level);
gint group);
void eek_key_set_oref (EekKey *key,
guint oref);

4
eek/eek-keyboard.c
View File

@ -191,7 +191,7 @@ void eek_keyboard_press_key(LevelKeyboard *keyboard, EekKey *key, guint32 timest
keyboard->pressed_keys = g_list_prepend (keyboard->pressed_keys, key);
struct squeek_symbol *symbol = eek_key_get_symbol_at_index(
key, 0, keyboard->level
key, 0
);
if (!symbol)
return;
@ -218,7 +218,7 @@ void eek_keyboard_release_key(LevelKeyboard *keyboard,
}
struct squeek_symbol *symbol = eek_key_get_symbol_at_index(
key, 0, keyboard->level);
key, 0);
if (!symbol)
return;

4
eek/eek-renderer.c
View File

@ -275,7 +275,7 @@ render_key (EekRenderer *self,
eek_renderer_get_foreground_color (self, priv->key_context, &foreground);
/* render icon (if any) */
symbol = eek_key_get_symbol_at_index (key, 0, level);
symbol = eek_key_get_symbol_at_index (key, 0);
if (!symbol)
return;
@ -389,7 +389,7 @@ eek_renderer_real_render_key_label (EekRenderer *self,
PangoLayoutLine *line;
gdouble scale;
symbol = eek_key_get_symbol_at_index(key, 0, level);
symbol = eek_key_get_symbol_at_index(key, 0);
if (!symbol)
return;