Merge branch 'fix_delay' into 'master'
ui: Cancel hiding delay when activity requested again See merge request Librem5/squeekboard!404
This commit is contained in:
@ -233,11 +233,6 @@ server_context_service_real_show_keyboard (ServerContextService *self)
|
||||
return;
|
||||
}
|
||||
|
||||
if (self->hiding) {
|
||||
g_source_remove (self->hiding);
|
||||
self->hiding = 0;
|
||||
}
|
||||
|
||||
if (!self->window) {
|
||||
make_window (self);
|
||||
}
|
||||
@ -269,6 +264,11 @@ server_context_service_show_keyboard (ServerContextService *self)
|
||||
{
|
||||
g_return_if_fail (SERVER_IS_CONTEXT_SERVICE(self));
|
||||
|
||||
if (self->hiding) {
|
||||
g_source_remove (self->hiding);
|
||||
self->hiding = 0;
|
||||
}
|
||||
|
||||
if (!self->visible) {
|
||||
server_context_service_real_show_keyboard (self);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user