kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: fix command completer selection on item activate

Browse Source
This commit is contained in:
Zheng, Lei
2022-03-14 10:24:57 +08:00
committed by wwmayer
parent 7942ed61c5
commit d10a7aae7c
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Gui/DlgKeyboardImp.cpp
View File

@@ -111,13 +111,16 @@ DlgCustomKeyboardImp::~DlgCustomKeyboardImp()
{
}
void DlgCustomKeyboardImp::initCommandCompleter(QLineEdit *edit, QComboBox *combo, QTreeWidget *commandTreeWidget)
void DlgCustomKeyboardImp::initCommandCompleter(QLineEdit *edit,
QComboBox *combo,
QTreeWidget *commandTreeWidget,
QTreeWidgetItem *separatorItem)
{
edit->setPlaceholderText(tr("Type to search..."));
auto completer = new CommandCompleter(edit, edit);
QObject::connect(completer, &CommandCompleter::commandActivated,
[combo, commandTreeWidget](const QByteArray &name) {
[=](const QByteArray &name) {
CommandManager & cCmdMgr = Application::Instance->commandManager();
Command *cmd = cCmdMgr.getCommandByName(name.constData());
if (!cmd)
@@ -128,8 +131,9 @@ void DlgCustomKeyboardImp::initCommandCompleter(QLineEdit *edit, QComboBox *comb
if (index < 0)
return;
if (index != combo->currentIndex()) {
QSignalBlocker blocker(combo);
combo->setCurrentIndex(index);
combo->activated(index);
populateCommandList(commandTreeWidget, separatorItem, combo);
}
for (int i=0 ; i<commandTreeWidget->topLevelItemCount(); ++i) {
QTreeWidgetItem *item = commandTreeWidget->topLevelItem(i);
@@ -207,10 +211,10 @@ DlgCustomKeyboardImp::initCommandList(QTreeWidget *commandTreeWidget,
});
QObject::connect(ShortcutManager::instance(), &ShortcutManager::shortcutChanged,
[timer]() { timer->start(100); });
timer, [timer]() { timer->start(100); });
QObject::connect(combo, QOverload<int>::of(&QComboBox::activated),
[timer]() { timer->start(100); });
timer, [timer]() { timer->start(100); });
return Application::Instance->commandManager().signalChanged.connect([timer](){
timer->start(100);
@@ -273,7 +277,7 @@ DlgCustomKeyboardImp::initCommandWidgets(QTreeWidget *commandTreeWidget,
AccelLineEdit *editShortcut,
AccelLineEdit *currentShortcut)
{
initCommandCompleter(editCommand, comboGroups, commandTreeWidget);
initCommandCompleter(editCommand, comboGroups, commandTreeWidget, separatorItem);
auto conn = initCommandList(commandTreeWidget, separatorItem, comboGroups);
if (priorityList && buttonUp && buttonDown) {

5
src/Gui/DlgKeyboardImp.h
View File

@@ -90,7 +90,10 @@ protected:
/** @name Internal helper function for handling command list widgets
*/
//@{
static void initCommandCompleter(QLineEdit *, QComboBox *combo, QTreeWidget *treeWidget);
static void initCommandCompleter(QLineEdit *,
QComboBox *combo,
QTreeWidget *treeWidget,
QTreeWidgetItem *separatorItem);
static boost::signals2::connection initCommandList(QTreeWidget *, QTreeWidgetItem *, QComboBox *combo);
static void initPriorityList(QTreeWidget *, QAbstractButton *buttonUp, QAbstractButton *buttonDown);
static void populateCommandGroups(QComboBox *);