mirror of
https://bitbucket.org/smil3y/kde-workspace.git
synced 2025-02-23 18:32:50 +00:00
plasma: fix and pretty-fy the switchwindow containment actions
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
4eb64ca003
commit
91a4f9036a
1 changed files with 12 additions and 8 deletions
|
@ -125,10 +125,12 @@ void SwitchWindow::makeMenu()
|
|||
} else {
|
||||
int numDesktops = KWindowSystem::numberOfDesktops();
|
||||
if (m_mode == AllFlat) {
|
||||
for (int i = 1; i <= numDesktops; ++i) {
|
||||
for (int i = 0; i <= numDesktops; ++i) {
|
||||
if (desktops.contains(i)) {
|
||||
QString name = KWindowSystem::desktopName(i);
|
||||
name = QString("%1: %2").arg(i).arg(name);
|
||||
if (name.isEmpty()) {
|
||||
name = QString::number(i);
|
||||
}
|
||||
m_menu->addTitle(name);
|
||||
m_menu->addActions(desktops.values(i));
|
||||
}
|
||||
|
@ -138,13 +140,15 @@ void SwitchWindow::makeMenu()
|
|||
m_menu->addActions(desktops.values(-1));
|
||||
}
|
||||
} else { //submenus
|
||||
for (int i = 1; i <= numDesktops; ++i) {
|
||||
for (int i = 0; i <= numDesktops; ++i) {
|
||||
if (desktops.contains(i)) {
|
||||
QString name = KWindowSystem::desktopName(i);
|
||||
name = QString("%1: %2").arg(i).arg(name);
|
||||
KMenu *subMenu = new KMenu(name, m_menu);
|
||||
subMenu->addActions(desktops.values(i));
|
||||
m_menu->addMenu(subMenu);
|
||||
QString name = KWindowSystem::desktopName(i);
|
||||
if (name.isEmpty()) {
|
||||
name = QString::number(i);
|
||||
}
|
||||
KMenu *subMenu = new KMenu(name, m_menu);
|
||||
subMenu->addActions(desktops.values(i));
|
||||
m_menu->addMenu(subMenu);
|
||||
}
|
||||
}
|
||||
if (desktops.contains(-1)) {
|
||||
|
|
Loading…
Add table
Reference in a new issue