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

layout_state: Don't always operate on the global instance

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2020-03-07 15:40:17 +00:00
parent 6d7360a230
commit 9ce2cf254b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
eek/eek-gtk-keyboard.c
View File

@ -124,9 +124,10 @@ eek_gtk_keyboard_real_size_allocate (GtkWidget *self,
(uint32_t)(allocation->width - allocation->x) * scale, (uint32_t)(allocation->width - allocation->x) * scale,
(uint32_t)(allocation->height - allocation->y) * scale); (uint32_t)(allocation->height - allocation->y) * scale);
if (priv->layout->arrangement != new_type) { if (priv->layout->arrangement != new_type) {
priv->layout->arrangement = new_type; struct squeek_layout_state layout = *priv->layout;
layout.arrangement = new_type;
eek_layout_holder_use_layout(priv->eekboard_context, priv->layout); eek_layout_holder_use_layout(priv->eekboard_context, &layout);
} }
if (priv->renderer) if (priv->renderer)

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

@ -99,6 +99,7 @@ settings_get_layout(GSettings *settings, char **type, char **layout)
void void
eek_layout_holder_use_layout(LayoutHolder *context, struct squeek_layout_state *state) { eek_layout_holder_use_layout(LayoutHolder *context, struct squeek_layout_state *state) {
*context->layout = *state;
gchar *layout_name = state->overlay_name; gchar *layout_name = state->overlay_name;
if (layout_name == NULL) { if (layout_name == NULL) {