The change in D14581 triggered the spawning of an additional header in QML KCMs in icon view mode.
The additional header was the header of the previously opened QWidgets KCM.
Sidebar view doesn't have this issue so I went and found the code that prevents the bug from happening and added it to icon view.
Given that icon view also has an additional sidebar when there's more than 1 category, a check also needed to be added so that we don't lose the sidebar.
BUG: 400876
Before:
After:
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
Oh, well done!
I'd seen the bug report but hadn't been able to fix it.
| icons/IconMode.cpp | ||
|---|---|---|
| 119 | In general we want to not mix two styles in the same method. The rest of the code uses | |
I just realized this kills the sidebar when there's more than 1 kcm under a category :(
So we also fix this by setting:
d->moduleView()->setFaceType(KPageView::List);
But then then a sidebar shows up even if there is only 1 category.
So just need to check for the number of categories and do List if > 1, otherwise Plain.
| icons/IconMode.cpp | ||
|---|---|---|
| 144 | Since this is only used once, you don't really need to define a variable to hold it; just use it directly in the if statement. | |
| icons/IconMode.cpp | ||
|---|---|---|
| 144 | pedantic nitpick: space before the final ) | |
I think that makes sense.
I tested this by comparing every KCM with 5.17 system settings and saw no issues. Breadcrumb navigation worked as well.