From 339c684a7df95952f8848c5bae4fa5ed891ebb42 Mon Sep 17 00:00:00 2001 From: mokapsing <39441028+mokapsing@users.noreply.github.com> Date: Wed, 26 Jun 2024 12:21:47 +0800 Subject: [PATCH 1/2] allow hide candidate list by rime option _hide_candidate --- src/rimestate.cpp | 3 ++- src/rimestate.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/rimestate.cpp b/src/rimestate.cpp index a8fe4b9..30b8fd3 100644 --- a/src/rimestate.cpp +++ b/src/rimestate.cpp @@ -408,7 +408,8 @@ void RimeState::updateUI(InputContext *ic, bool keyRelease) { updatePreedit(ic, context); - if (context.menu.num_candidates) { + if (!api->get_option(session, FCITX_HIDE_CANDIDATES) && + context.menu.num_candidates) { ic->inputPanel().setCandidateList( std::make_unique(engine_, ic, context)); } else { diff --git a/src/rimestate.h b/src/rimestate.h index 07a73e1..040277b 100644 --- a/src/rimestate.h +++ b/src/rimestate.h @@ -19,6 +19,7 @@ #include #define RIME_ASCII_MODE "ascii_mode" +#define FCITX_HIDE_CANDIDATES "_hide_candidate" namespace fcitx { From 0c0fb4ad0cd3a2d7e1cc30613d105075cfc6c23b Mon Sep 17 00:00:00 2001 From: MokapSing <39441028+MokOopsing@users.noreply.github.com> Date: Mon, 20 Oct 2025 01:31:56 +0000 Subject: [PATCH 2/2] =?UTF-8?q?Refactor:=20follow=20maintainer=E2=80=99s?= =?UTF-8?q?=20review=20suggestions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Move the expensive condition check to the right side of `&&`. - Rename `FCITX_HIDE_CANDIDATES` to `RIME_HIDE_CANDIDATES` for consistency with RIME official naming. --- src/rimestate.cpp | 4 ++-- src/rimestate.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rimestate.cpp b/src/rimestate.cpp index 30b8fd3..4be2c5a 100644 --- a/src/rimestate.cpp +++ b/src/rimestate.cpp @@ -408,8 +408,8 @@ void RimeState::updateUI(InputContext *ic, bool keyRelease) { updatePreedit(ic, context); - if (!api->get_option(session, FCITX_HIDE_CANDIDATES) && - context.menu.num_candidates) { + if (context.menu.num_candidates && + !api->get_option(session, RIME_HIDE_CANDIDATES)) { ic->inputPanel().setCandidateList( std::make_unique(engine_, ic, context)); } else { diff --git a/src/rimestate.h b/src/rimestate.h index 040277b..ea00b7a 100644 --- a/src/rimestate.h +++ b/src/rimestate.h @@ -19,7 +19,7 @@ #include #define RIME_ASCII_MODE "ascii_mode" -#define FCITX_HIDE_CANDIDATES "_hide_candidate" +#define RIME_HIDE_CANDIDATES "_hide_candidate" namespace fcitx {