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

levelkeyboard: Rearrange to make future conversion easier

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2020-02-25 15:46:58 +00:00
parent 4ff9cf087b
commit 22daefba3a
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eek/eek-keyboard.c
View File

@ -38,10 +38,8 @@ void level_keyboard_free(LevelKeyboard *self) {
} }
LevelKeyboard* LevelKeyboard*
level_keyboard_new (const gchar *keyboard_type, level_keyboard_new (struct squeek_layout *layout)
enum squeek_arrangement_kind t)
{ {
struct squeek_layout *layout = squeek_load_layout(keyboard_type, t);
LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1); LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1);
if (!keyboard) { if (!keyboard) {

3
eek/eek-keyboard.h
View File

@ -47,8 +47,7 @@ gchar * eek_keyboard_get_keymap
(LevelKeyboard *keyboard); (LevelKeyboard *keyboard);
LevelKeyboard* LevelKeyboard*
level_keyboard_new (const gchar *keyboard_type, level_keyboard_new (struct squeek_layout *layout);
enum squeek_arrangement_kind t);
void level_keyboard_free(LevelKeyboard *self); void level_keyboard_free(LevelKeyboard *self);
G_END_DECLS G_END_DECLS

3
eekboard/eekboard-context-service.c
View File

@ -139,7 +139,8 @@ eekboard_context_service_use_layout(EekboardContextService *context, struct sque
} }
// generic part follows // generic part follows
LevelKeyboard *keyboard = level_keyboard_new(layout_name, state->arrangement); struct squeek_layout *layout = squeek_load_layout(layout_name, state->arrangement);
LevelKeyboard *keyboard = level_keyboard_new(layout);
// set as current // set as current
LevelKeyboard *previous_keyboard = context->priv->keyboard; LevelKeyboard *previous_keyboard = context->priv->keyboard;
context->priv->keyboard = keyboard; context->priv->keyboard = keyboard;