Skip to content

Commit

Permalink
kconfig: qconf: fix the content of the main widget
Browse files Browse the repository at this point in the history
The port to Qt5 tried to preserve the same way as it used
to work with Qt3 and Qt4. However, at least with newer
versions of Qt5 (5.13), this doesn't work properly.

Change the schema by adding a vertical layout, in order
for it to start working properly again.

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Masahiro Yamada <[email protected]>
  • Loading branch information
mchehab authored and masahir0y committed Apr 8, 2020
1 parent 5752ff0 commit cce1fab
Showing 1 changed file with 17 additions and 6 deletions.
23 changes: 17 additions & 6 deletions scripts/kconfig/qconf.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1360,21 +1360,32 @@ ConfigMainWindow::ConfigMainWindow(void)
if ((x.isValid())&&(y.isValid()))
move(x.toInt(), y.toInt());

split1 = new QSplitter(this);
QWidget *widget = new QWidget(this);
QVBoxLayout *layout = new QVBoxLayout(widget);
setCentralWidget(widget);

split1 = new QSplitter(widget);
split1->setOrientation(Qt::Horizontal);
setCentralWidget(split1);
split1->setChildrenCollapsible(false);

menuView = new ConfigView(split1, "menu");
menuView = new ConfigView(widget, "menu");
menuList = menuView->list;

split2 = new QSplitter(split1);
split2 = new QSplitter(widget);
split2->setChildrenCollapsible(false);
split2->setOrientation(Qt::Vertical);

// create config tree
configView = new ConfigView(split2, "config");
configView = new ConfigView(widget, "config");
configList = configView->list;

helpText = new ConfigInfoView(split2, "help");
helpText = new ConfigInfoView(widget, "help");

layout->addWidget(split2);
split2->addWidget(split1);
split1->addWidget(configView);
split1->addWidget(menuView);
split2->addWidget(helpText);

setTabOrder(configList, helpText);
configList->setFocus();
Expand Down

0 comments on commit cce1fab

Please sign in to comment.