kconfig: qconf: do not limit the pop-up menu to the first row (fa8de0a3) · Commits · 戴 / test

If you right-click the first row in the option tree, the pop-up menu shows up, but if you right-click the second row or below, the event is ignored due to the following check: if (e->y() <= header()->geometry().bottom()) { Perhaps, the intention was to show the pop-menu only when the tree header was right-clicked, but this handler is not called in that case. Since the origin of e->y() starts from the bottom of the header, this check is odd. Going forward, you can right-click anywhere in the tree to get the pop-up menu. Signed-off-by:

Masahiro Yamada <masahiroy@kernel.org>

scripts/kconfig/qconf.cc

+34 −34

Original line number	Diff line number	Diff line
		@@ -864,7 +864,6 @@ void ConfigList::focusInEvent(QFocusEvent *e)

		void ConfigList::contextMenuEvent(QContextMenuEvent *e)
		{
		if (e->y() <= header()->geometry().bottom()) {
		if (!headerPopup) {
		QAction *action;

		@@ -877,6 +876,7 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e)
		action, SLOT(setOn(bool)));
		action->setChecked(showName);
		headerPopup->addAction(action);

		action = new QAction("Show Range", this);
		action->setCheckable(true);
		connect(action, SIGNAL(toggled(bool)),
		@@ -885,6 +885,7 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e)
		action, SLOT(setOn(bool)));
		action->setChecked(showRange);
		headerPopup->addAction(action);

		action = new QAction("Show Data", this);
		action->setCheckable(true);
		connect(action, SIGNAL(toggled(bool)),
		@@ -894,10 +895,9 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e)
		action->setChecked(showData);
		headerPopup->addAction(action);
		}

		headerPopup->exec(e->globalPos());
		e->accept();
		} else
		e->ignore();
		}

		ConfigView*ConfigView::viewList;

Admin message