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

Omit keys without labels on the current level, update key definitions

Browse Source
This commit is contained in:
David Boddie
2019-07-18 21:16:22 +02:00
parent a045810af6
commit e5b6d66d60
7 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eek/eek-key.c
View File

@ -609,3 +609,11 @@ void eek_key_set_pressed(EekKey *key, gboolean value)
priv->is_pressed = value;
}
gboolean
eek_key_has_label(EekKey *key)
{
EekSymbol *symbol = eek_key_get_symbol(key);
return (eek_symbol_get_label(symbol) != NULL) ||
(eek_symbol_get_icon_name(symbol) != NULL);
}

2
eek/eek-key.h
View File

@ -89,5 +89,7 @@ gboolean eek_key_is_locked (EekKey *key);
void eek_key_set_pressed (EekKey *key,
gboolean value);
gboolean eek_key_has_label (EekKey *key);
G_END_DECLS
#endif /* EEK_KEY_H */

3
eek/eek-renderer.c
View File

@ -447,6 +447,9 @@ render_key (EekRenderer *self,
PangoRectangle extents = { 0, };
EekColor foreground;
if (!eek_key_has_label(key))
return;
oref = eek_key_get_oref (key);
outline = eek_keyboard_get_outline (priv->keyboard, oref);
if (outline == NULL)

12
eek/eek-section.c
View File

@ -500,10 +500,6 @@ keysizer(EekElement *element, gpointer user_data)
{
EekKey *key = EEK_KEY(element);
/* Skip keys without symbols for the current level. */
if (!eek_key_get_symbol(key))
return;
EekKeyboard *keyboard = EEK_KEYBOARD(user_data);
uint oref = eek_key_get_oref (key);
EekOutline *outline = eek_keyboard_get_outline (keyboard, oref);
@ -539,8 +535,8 @@ keycounter (EekElement *element, gpointer user_data)
{
EekKey *key = EEK_KEY(element);
/* Skip keys without symbols for the current level. */
if (!eek_key_get_symbol(key))
/* Skip keys without labels for the current level. */
if (!eek_key_has_label(key))
return;
struct keys_info *data = user_data;
@ -558,8 +554,8 @@ keyplacer(EekElement *element, gpointer user_data)
{
EekKey *key = EEK_KEY(element);
/* Skip keys without symbols for the current level. */
if (!eek_key_get_symbol(key))
/* Skip keys without labels for the current level. */
if (!eek_key_has_label(key))
return;
double *current_offset = user_data;