yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Plasma/5.9'

Browse source
This commit is contained in:
Roman Gilg 2017-01-16 19:27:32 +01:00
commit 5baf75d11e
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tabbox/tabboxhandler.cpp
View file

@ -323,6 +323,9 @@ void TabBoxHandlerPrivate::show()
} }
} }
if (SwitcherItem *item = switcherItem()) { if (SwitcherItem *item = switcherItem()) {
// In case the model isn't yet set (see below), index will be reset and therefore we
// need to save the current index row (https://bugs.kde.org/show_bug.cgi?id=333511).
int indexRow = index.row();
if (!item->model()) { if (!item->model()) {
QAbstractItemModel *model = nullptr; QAbstractItemModel *model = nullptr;
if (desktopMode) { if (desktopMode) {
@ -333,7 +336,7 @@ void TabBoxHandlerPrivate::show()
item->setModel(model); item->setModel(model);
} }
item->setAllDesktops(config.clientDesktopMode() == TabBoxConfig::AllDesktopsClients); item->setAllDesktops(config.clientDesktopMode() == TabBoxConfig::AllDesktopsClients);
item->setCurrentIndex(index.row()); item->setCurrentIndex(indexRow);
// everything is prepared, so let's make the whole thing visible // everything is prepared, so let's make the whole thing visible
item->setVisible(true); item->setVisible(true);
} }