[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace] kwin/kcmkwin/kwindecoration: Fix config dialog of Aurorae decorations
From:       Martin_Gräßlin <mgraesslin () kde ! org>
Date:       2014-02-21 11:15:20
Message-ID: E1WGo4e-0008Fn-AB () scm ! kde ! org
[Download RAW message or body]

Git commit 66378215c7c4b54a5ae0006abbe87659d47bd96b by Martin Gräßlin.
Committed on 21/02/2014 at 11:12.
Pushed by graesslin into branch 'master'.

Fix config dialog of Aurorae decorations

Install the layout on the dialog not on the KCM.

M  +3    -3    kwin/kcmkwin/kwindecoration/kwindecoration.cpp

http://commits.kde.org/kde-workspace/66378215c7c4b54a5ae0006abbe87659d47bd96b

diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp \
b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp index 8bc1071..83fef10 100644
--- a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -370,12 +370,12 @@ void KWinDecorationModule::slotConfigureDecoration()
         dlg->setWindowTitle(i18n("Decoration Options"));
         KWinAuroraeConfigForm *form = new KWinAuroraeConfigForm(dlg);
         form->enableNoSideBorderSupport(index.data(DecorationModel::TypeRole).toInt() \
                == DecorationModelData::QmlDecoration);
-        setLayout(new QVBoxLayout);
+        dlg->setLayout(new QVBoxLayout);
         QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | \
QDialogButtonBox::Cancel, dlg.data());  connect(buttons, SIGNAL(accepted()), dlg, \
SLOT(accept()));  connect(buttons, SIGNAL(rejected()), dlg, SLOT(reject()));
-        layout()->addWidget(form);
-        layout()->addWidget(buttons);
+        dlg->layout()->addWidget(form);
+        dlg->layout()->addWidget(buttons);
 
         form->borderSizesCombo->setCurrentIndex(index.data(DecorationModel::BorderSizeRole).toInt());
                
         form->buttonSizesCombo->setCurrentIndex(index.data(DecorationModel::ButtonSizeRole).toInt());



[prev in list] [next in list] [prev in thread] [next in thread]