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

Only recreate the widget when the keyboard layout changes

Browse Source 
Avoid creating a widget before there is a window to put it in.
This commit is contained in:
David Boddie
2019-07-25 18:07:08 +00:00
parent 1246776328
commit e9cf572a3c
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/server-context-service.c
View File

@ -75,6 +75,9 @@ on_destroy (GtkWidget *widget, gpointer user_data)
eekboard_context_service_destroy (EEKBOARD_CONTEXT_SERVICE (context)); eekboard_context_service_destroy (EEKBOARD_CONTEXT_SERVICE (context));
} }
static void
make_widget (ServerContextService *context);
static void static void
on_notify_keyboard (GObject *object, on_notify_keyboard (GObject *object,
GParamSpec *spec, GParamSpec *spec,
@ -94,6 +97,9 @@ on_notify_keyboard (GObject *object,
keyboard); keyboard);
/* Recreate the keyboard widget to keep in sync with the keymap. */ /* Recreate the keyboard widget to keep in sync with the keymap. */
if (context->window)
make_widget(context);
gboolean visible; gboolean visible;
g_object_get (context, "visible", &visible, NULL); g_object_get (context, "visible", &visible, NULL);
@ -232,7 +238,11 @@ make_widget (ServerContextService *context)
EekKeyboard *keyboard; EekKeyboard *keyboard;
EekTheme *theme; EekTheme *theme;
g_return_if_fail (!context->widget); if (context->widget) {
gtk_widget_destroy(context->widget);
context->widget = NULL;
}
theme = eek_theme_new ("resource:///sm/puri/squeekboard/style.css", theme = eek_theme_new ("resource:///sm/puri/squeekboard/style.css",
NULL, NULL,
NULL); NULL);
@ -257,12 +267,8 @@ server_context_service_real_show_keyboard (EekboardContextService *_context)
if (!context->window) if (!context->window)
make_window (context); make_window (context);
if (context->widget) { if (!context->widget)
gtk_widget_destroy(context->widget); make_widget (context);
context->widget = NULL;
}
make_widget (context);
EEKBOARD_CONTEXT_SERVICE_CLASS (server_context_service_parent_class)-> EEKBOARD_CONTEXT_SERVICE_CLASS (server_context_service_parent_class)->
show_keyboard (_context); show_keyboard (_context);