Commit b06c3ec3 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Masahiro Yamada
Browse files

kconfig: qconf: re-implement setSelected() 



The default implementation for setSelected() at QTreeWidgetItem
allows multiple items to be selected.

Well, this should never be possible for the configItem lists.

So, implement a function that will automatically clean any
previous selection. This simplifies the logic somewhat, while
making the selection logic to be applied atomically, avoiding
future issues on that.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent c4f7398b

scripts/kconfig/qconf.cc

+4 −11
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ void ConfigList::setRootMenu(struct menu *menu) 
	rootEntry = menu;

	updateListAll();

	if (currentItem()) {

		currentItem()->setSelected(hasFocus());

		setSelected(currentItem(), hasFocus());

		scrollToItem(currentItem());

	}

}
@@ -865,7 +865,7 @@ void ConfigList::focusInEvent(QFocusEvent *e) 


	ConfigItem* item = (ConfigItem *)currentItem();

	if (item) {

		item->setSelected(true);

		setSelected(item, true);

		menu = item->menu;

	}

	emit gotFocus(menu);
@@ -1711,17 +1711,10 @@ void ConfigMainWindow::setMenuLink(struct menu *menu) 
			if (!parent)

				return;



			/* 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) {

				item->setSelected(true);

				configList->setSelected(item, true);

				configList->scrollToItem(item);

			}
@@ -1740,7 +1733,7 @@ void ConfigMainWindow::setMenuLink(struct menu *menu) 
	if (list) {

		item = list->findConfigItem(menu);

		if (item) {

			item->setSelected(true);

			list->setSelected(item, true);

			list->scrollToItem(item);

			list->setFocus();

		}

scripts/kconfig/qconf.h

+7 −1
Original line number Diff line number Diff line
@@ -45,11 +45,17 @@ class ConfigList : public QTreeWidget { 
public:

	ConfigList(ConfigView* p, const char *name = 0);

	void reinit(void);

	ConfigItem* findConfigItem(struct menu *);

	ConfigView* parent(void) const

	{

		return (ConfigView*)Parent::parent();

	}

	ConfigItem* findConfigItem(struct menu *);

	void setSelected(QTreeWidgetItem *item, bool enable) {

		for (int i = 0; i < selectedItems().size(); i++)

			selectedItems().at(i)->setSelected(false);



		item->setSelected(enable);

	}



protected:

	void keyPressEvent(QKeyEvent *e);

CRA Git | Maintained and supported by SUSTech CRA and CCSE