mirror of
https://bitbucket.org/smil3y/kde-workspace.git
synced 2025-02-24 02:42:50 +00:00
kwin: set compositing type to None when it is not saved as XRender in KCM
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
21d5aaf376
commit
848f20762a
1 changed files with 7 additions and 2 deletions
|
@ -127,8 +127,10 @@ KWinCompositingConfig::KWinCompositingConfig(QWidget *parent, const QVariantList
|
||||||
#ifndef KWIN_BUILD_COMPOSITE
|
#ifndef KWIN_BUILD_COMPOSITE
|
||||||
ui.compositingType->removeItem(0);
|
ui.compositingType->removeItem(0);
|
||||||
#define XRENDER_INDEX -1
|
#define XRENDER_INDEX -1
|
||||||
|
#define NONE_INDEX 0
|
||||||
#else
|
#else
|
||||||
#define XRENDER_INDEX 0
|
#define XRENDER_INDEX 0
|
||||||
|
#define NONE_INDEX 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
connect(ui.tabWidget, SIGNAL(currentChanged(int)), this, SLOT(currentTabChanged(int)));
|
connect(ui.tabWidget, SIGNAL(currentChanged(int)), this, SLOT(currentTabChanged(int)));
|
||||||
|
@ -315,8 +317,9 @@ void KWinCompositingConfig::alignGuiToCompositingType(int compositingType)
|
||||||
{
|
{
|
||||||
ui.scaleMethodLabel->setVisible(compositingType == XRENDER_INDEX);
|
ui.scaleMethodLabel->setVisible(compositingType == XRENDER_INDEX);
|
||||||
ui.xrScaleFilter->setVisible(compositingType == XRENDER_INDEX);
|
ui.xrScaleFilter->setVisible(compositingType == XRENDER_INDEX);
|
||||||
if (compositingType == XRENDER_INDEX)
|
if (compositingType == XRENDER_INDEX) {
|
||||||
ui.scaleMethodLabel->setBuddy(ui.xrScaleFilter);
|
ui.scaleMethodLabel->setBuddy(ui.xrScaleFilter);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void KWinCompositingConfig::toggleEffectShortcutChanged(const QKeySequence &seq)
|
void KWinCompositingConfig::toggleEffectShortcutChanged(const QKeySequence &seq)
|
||||||
|
@ -347,6 +350,8 @@ void KWinCompositingConfig::loadAdvancedTab()
|
||||||
QString backend = config.readEntry("Backend", "XRender");
|
QString backend = config.readEntry("Backend", "XRender");
|
||||||
if (backend == "XRender") {
|
if (backend == "XRender") {
|
||||||
ui.compositingType->setCurrentIndex(XRENDER_INDEX);
|
ui.compositingType->setCurrentIndex(XRENDER_INDEX);
|
||||||
|
} else {
|
||||||
|
ui.compositingType->setCurrentIndex(NONE_INDEX);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 4 - off, 5 - shown, 6 - always, other are old values
|
// 4 - off, 5 - shown, 6 - always, other are old values
|
||||||
|
@ -450,7 +455,7 @@ bool KWinCompositingConfig::saveAdvancedTab()
|
||||||
|
|
||||||
KConfigGroup config(mKWinConfig, "Compositing");
|
KConfigGroup config(mKWinConfig, "Compositing");
|
||||||
|
|
||||||
QString backend;
|
QString backend = "none";
|
||||||
|
|
||||||
switch (ui.compositingType->currentIndex()) {
|
switch (ui.compositingType->currentIndex()) {
|
||||||
case XRENDER_INDEX:
|
case XRENDER_INDEX:
|
||||||
|
|
Loading…
Add table
Reference in a new issue