diff --git a/.gitmodules b/.gitmodules index 6071e74..0b98d60 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "fcitx5"] path = fcitx5 - url = https://github.com/fcitx/fcitx5 + url = https://github.com/fcitx-contrib/fcitx5 [submodule "fcitx5-webview"] path = fcitx5-webview url = https://github.com/fcitx-contrib/fcitx5-webview diff --git a/fcitx5 b/fcitx5 index aec50f3..2e72254 160000 --- a/fcitx5 +++ b/fcitx5 @@ -1 +1 @@ -Subproject commit aec50f3d8b038c2d7c18220ec3d582a7f0e80e25 +Subproject commit 2e72254c66dc9479dfaafa208be2c93cf32daec6 diff --git a/webpanel/webpanel.cpp b/webpanel/webpanel.cpp index 942e6ce..d1076d7 100644 --- a/webpanel/webpanel.cpp +++ b/webpanel/webpanel.cpp @@ -360,7 +360,10 @@ void WebPanel::updateInputPanel(const Text &preedit, const Text &auxUp, void WebPanel::updateClient(InputContext *ic) { if (auto macosIC = dynamic_cast(ic)) { - macosIC->setDummyPreedit(bool(panelShow_)); + // Don't set dummy preedit when switching IM. It will clear current cell + // in LibreOffice. + macosIC->setDummyPreedit(bool(panelShow_) && + !macosIC->inputPanel().transient()); if (!macosIC->isSyncEvent) { macosIC->commitAndSetPreeditAsync(); }