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

Merge branch 'mem' into 'master'

Browse Source 
Fix visibility-related bugs

See merge request Librem5/squeekboard!25
This commit is contained in:
David Boddie
2019-07-08 21:25:27 +00:00
parent 6702edaa9d c3ffe6ab8b
commit b3e1d84e6c
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -569,16 +569,20 @@ eekboard_context_service_show_keyboard (EekboardContextService *context)
{ {
g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context)); g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));
if (!context->priv->visible) {
EEKBOARD_CONTEXT_SERVICE_GET_CLASS(context)->show_keyboard (context); EEKBOARD_CONTEXT_SERVICE_GET_CLASS(context)->show_keyboard (context);
} }
}
void void
eekboard_context_service_hide_keyboard (EekboardContextService *context) eekboard_context_service_hide_keyboard (EekboardContextService *context)
{ {
g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context)); g_return_if_fail (EEKBOARD_IS_CONTEXT_SERVICE(context));
if (context->priv->visible) {
EEKBOARD_CONTEXT_SERVICE_GET_CLASS(context)->hide_keyboard (context); EEKBOARD_CONTEXT_SERVICE_GET_CLASS(context)->hide_keyboard (context);
} }
}
/** /**
* eekboard_context_service_destroy: * eekboard_context_service_destroy:

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

@ -375,6 +375,7 @@ server_context_service_real_hide_keyboard (EekboardContextService *_context)
gtk_widget_hide (context->window); gtk_widget_hide (context->window);
gtk_container_remove(GTK_CONTAINER(context->window), context->widget); gtk_container_remove(GTK_CONTAINER(context->window), context->widget);
context->widget = NULL; // When GTK removes the widget, it doesn't just unlink it, but also frees it
destroy_window (context); destroy_window (context);
EEKBOARD_CONTEXT_SERVICE_CLASS (server_context_service_parent_class)-> EEKBOARD_CONTEXT_SERVICE_CLASS (server_context_service_parent_class)->