Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
kconfig: gconf: fix behavior of a menu under a symbol in split view
A menu can be created under a symbol.
[Example]
menu "outer menu"
config A
bool "A"
menu "inner menu"
depends on A
config B
bool "B"
endmenu
endmenu
After being re-parented by menu_finalize(), the menu tree is structured
like follows:
menu "outer menu"
\-- A
\-- menu "inner menu"
\-- B
In split view, the symbol A is shown in the right pane, so all of its
descendants must also be shown there. This has never worked correctly.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+2
-3
+2
-3
scripts/kconfig/gconf.c
+2
-3
scripts/kconfig/gconf.c
···
803
803
enum prop_type ptype;
804
804
ptype = menu->prompt ? menu->prompt->type : P_UNKNOWN;
805
805
806
-
if (ptype == P_MENU && view_mode != FULL_VIEW && col == COL_OPTION) {
806
+
if (ptype == P_MENU && view_mode == SINGLE_VIEW && col == COL_OPTION) {
807
807
// goes down into menu
808
808
browsed = menu;
809
809
display_tree_part();
···
953
953
gtk_tree_store_append(tree, &iter, parent);
954
954
set_node(tree, &iter, child);
955
955
956
-
if ((view_mode != FULL_VIEW) && (ptype == P_MENU)
957
-
&& (tree == tree2))
956
+
if ((view_mode == SINGLE_VIEW) && (ptype == P_MENU))
958
957
continue;
959
958
/*
960
959
if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))