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

Merge branch 'layout' into 'master'

Browse Source 
layouts: Stop assuming that layout name always changes on switch

Closes #276

See merge request Librem5/squeekboard!450
This commit is contained in:
Dorota Czaplejewicz
2021-04-12 10:21:35 +00:00
parent e4f1b121eb 4fdce2802a
commit c23b6f5f50
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/popover.rs
View File

@ -213,7 +213,16 @@ fn set_visible_layout(
layout_id: LayoutId, layout_id: LayoutId,
) { ) {
match layout_id { match layout_id {
LayoutId::System { kind, name } => set_layout(kind, name), LayoutId::System { kind, name } => {
unsafe {
use std::ptr;
manager::c::eekboard_context_service_set_overlay(
manager,
ptr::null(),
);
}
set_layout(kind, name);
}
LayoutId::Local(name) => { LayoutId::Local(name) => {
let name = CString::new(name.as_str()).unwrap(); let name = CString::new(name.as_str()).unwrap();
let name_ptr = name.as_ptr(); let name_ptr = name.as_ptr();