Commit c699eaab authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Masahiro Yamada

kconfig: qconf: make search fully work again on split mode

When the search dialog box finds symbols/menus that match
the search criteria, it presents all results at the window.

Clicking on a search result should make qconf to navigate
to the selected item. This works on singleMode and on
fullMode, but on splitMode, the navigation is broken.

This was partially caused by an incomplete Qt5 conversion
and by the followup patches that restored the original
behavior.

When qconf is on split mode, it has to update both the
config and the menu views. Right now, such logic is broken,
as it is not seeking using the right structures.

On qconf, the screen is split into 3 parts:

	+------------+-------+
	|            |       |
	|   Config   | Menu  |
	|            |       |
	+------------+-------+
	|                    |
	|     ConfigInfo     |
	|                    |
	+--------------------+

On singleMode and on fullMode, the menuView is hidden, and search
updates only the configList (which controls the ConfigView).

On SplitMode, the search logic should detect if the variable is a
leaf or not. If it is a leaf, it should be presented at the menuView,
and both configList and menuList should be updated. Otherwise, just
the configList should be updated.

Link: https://lore.kernel.org/lkml/a98b0f0ebe0c23615a76f1d23f25fd0c84835e6b.camel@redhat.com/Reported-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent cf81dfa4
...@@ -1636,22 +1636,33 @@ void ConfigMainWindow::setMenuLink(struct menu *menu) ...@@ -1636,22 +1636,33 @@ void ConfigMainWindow::setMenuLink(struct menu *menu)
return; return;
list->setRootMenu(parent); list->setRootMenu(parent);
break; break;
case symbolMode: case menuMode:
if (menu->flags & MENU_ROOT) { if (menu->flags & MENU_ROOT) {
configList->setRootMenu(menu); menuList->setRootMenu(menu);
configList->clearSelection(); configList->clearSelection();
list = menuList;
} else {
list = configList; list = configList;
} else {
parent = menu_get_parent_menu(menu->parent); parent = menu_get_parent_menu(menu->parent);
if (!parent) if (!parent)
return; return;
item = menuList->findConfigItem(parent);
/* Clear an already-selected item */
if (!configList->selectedItems().isEmpty()) {
item = (ConfigItem*)configList->selectedItems().first();
if (item)
item->setSelected(false);
}
/* Select the config view */
item = configList->findConfigItem(parent);
if (item) { if (item) {
item->setSelected(true); item->setSelected(true);
menuList->scrollToItem(item); configList->scrollToItem(item);
} }
list->setRootMenu(parent);
menuList->setRootMenu(parent);
menuList->clearSelection();
list = menuList;
} }
break; break;
case fullMode: case fullMode:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment