kwin: tab box compact/thumbnails mode fix

regression since:
8c39317b47c8ae6f17aee7a81af2db7b1762d454
fa28f20cd328a188de6aa779e0d6a726d6603e62

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/kwin/kcmkwin/kwintabbox/main.cpp b/kwin/kcmkwin/kwintabbox/main.cpp
index a2eb677..a2b47c4 100644 (file)
--- a/kwin/kcmkwin/kwintabbox/main.cpp
+++ b/kwin/kcmkwin/kwintabbox/main.cpp
@@ -393,9 +393,7 @@ void KWinTabBoxConfig::updateConfigFromUi(const KWin::KWinTabBoxConfigForm* ui,
 
     config.setShowTabBox(ui->showTabBox->isChecked());
     config.setHighlightWindows(ui->highlightWindowCheck->isChecked());
-    if (ui->effectCombo->currentIndex() >= Layout) {
-        config.setLayoutName(ui->effectCombo->itemData(ui->effectCombo->currentIndex()).toString());
-    }
+    config.setLayoutName(ui->effectCombo->itemData(ui->effectCombo->currentIndex()).toString());
     config.setShowDesktopMode(ui->showDesktop->isChecked() ? TabBoxConfig::ShowDesktopClient : TabBoxConfig::DoNotShowDesktopClient);
 }
 
@@ -410,21 +408,18 @@ void KWinTabBoxConfig::updateConfigFromUi(const KWin::KWinTabBoxConfigForm* ui,
 void KWinTabBoxConfig::effectSelectionChanged(int index)
 {
     CHECK_CURRENT_TABBOX_UI
-    ui->effectConfigButton->setIcon(KIcon(index < Layout ? "configure" : "view-preview"));
+    ui->effectConfigButton->setIcon(KIcon("view-preview"));
     if (!ui->showTabBox->isChecked())
         return;
-    ui->highlightWindowCheck->setEnabled(index >= Layout);
+    ui->highlightWindowCheck->setEnabled(index);
     if (m_layoutPreview && m_layoutPreview->isVisible()) {
-        if (index < Layout)
-            m_layoutPreview->hide();
-        else
-            m_layoutPreview->setLayout(ui->effectCombo->itemData(index, Qt::UserRole+1).toString(), ui->effectCombo->itemText(index));
+        m_layoutPreview->setLayout(ui->effectCombo->itemData(index, Qt::UserRole+1).toString(), ui->effectCombo->itemText(index));
     }
 }
 
 void KWinTabBoxConfig::tabBoxToggled(bool on) {
     CHECK_CURRENT_TABBOX_UI
-    on = !on || ui->effectCombo->currentIndex() >= Layout;
+    on = !on || ui->effectCombo->currentIndex() >= 0;
     ui->highlightWindowCheck->setEnabled(on);
     emit changed();
 }

diff --git a/kwin/kcmkwin/kwintabbox/main.h b/kwin/kcmkwin/kwintabbox/main.h
index 46dc593..85b439a 100644 (file)
--- a/kwin/kcmkwin/kwintabbox/main.h
+++ b/kwin/kcmkwin/kwintabbox/main.h
@@ -74,11 +74,6 @@ private:
     void initLayoutLists();
 
 private:
-    enum Mode {
-        CoverSwitch = 0,
-        FlipSwitch = 1,
-        Layout = 2
-    };
     KWinTabBoxConfigForm* m_primaryTabBoxUi;
     KWinTabBoxConfigForm* m_alternativeTabBoxUi;
     KSharedConfigPtr m_config;