Skip to content

Commit e861f54

Browse files
committed
fix: shortcut of "Scroll bewteen input methods" is wrong
增加 NONE 选项 Issues linuxdeepin/developer-center#7302
1 parent 4555010 commit e861f54

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

src/fcitx5Interface/advanceconfig.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,9 @@ QDialog *AdvanceConfig::configDialog(QWidget *parent, DBusProvider *dbus,
247247

248248
void AdvanceConfig::switchIMShortCuts(const QString &shortCuts)
249249
{
250-
if(shortCuts == "CTRL_SHIFT") {
250+
if(shortCuts == "NONE") {
251+
m_switchIMShortCuts = "";
252+
} else if(shortCuts == "CTRL_SHIFT") {
251253
m_switchIMShortCuts = "Control+Shift+Shift_L Control+Shift+Shift_R";
252254
} else if(shortCuts == "ALT_SHIFT") {
253255
m_switchIMShortCuts = "Alt+Shift+Shift_R Alt+Shift+Shift_L";

src/window/imsettingwindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ void IMSettingWindow::initUI()
132132
// 快捷键 切换输入法 切换虚拟键盘 切换至默认输入法
133133
m_shortcutGroup = new DCC_NAMESPACE::SettingsGroup(nullptr, DCC_NAMESPACE::SettingsGroup::GroupBackground);
134134
m_imSwitchCbox = new DCC_NAMESPACE::ComboxWidget(tr("Scroll between input methods"));
135-
m_imSwitchCbox->setComboxOption({ "CTRL_SHIFT", "ALT_SHIFT", "CTRL_SUPER", "ALT_SUPER" });
135+
m_imSwitchCbox->setComboxOption({ "NONE", "CTRL_SHIFT", "ALT_SHIFT", "CTRL_SUPER", "ALT_SUPER" });
136136
m_imSwitchCbox->comboBox()->setAccessibleName("Switch input methods");
137137
m_defaultIMKey = new FcitxKeySettingsItem(tr("Switch between the current/first input method"));
138138
m_shortcutGroup->appendItem(m_imSwitchCbox);

0 commit comments

Comments
 (0)