diff --git a/kcmkwin/kwinscreenedges/main.cpp b/kcmkwin/kwinscreenedges/main.cpp index e07cba6cf8..9de436a813 100644 --- a/kcmkwin/kwinscreenedges/main.cpp +++ b/kcmkwin/kwinscreenedges/main.cpp @@ -58,6 +58,7 @@ KWinScreenEdgesConfig::KWinScreenEdgesConfig(QWidget* parent, const QVariantList connect(m_ui->triggerCooldownSpin, SIGNAL(valueChanged(int)), this, SLOT(changed())); connect(m_ui->quickMaximizeBox, SIGNAL(stateChanged(int)), this, SLOT(changed())); connect(m_ui->quickTileBox, SIGNAL(stateChanged(int)), this, SLOT(changed())); + connect(m_ui->electricBorderCornerRatio, SIGNAL(valueChanged(int)), this, SLOT(changed())); // Visual feedback of action group conflicts connect(m_ui->desktopSwitchCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(groupChanged())); @@ -96,6 +97,7 @@ void KWinScreenEdgesConfig::load() m_ui->triggerCooldownSpin->setValue(config.readEntry("ElectricBorderCooldown", 350)); m_ui->quickMaximizeBox->setChecked(config.readEntry("ElectricBorderMaximize", true)); m_ui->quickTileBox->setChecked(config.readEntry("ElectricBorderTiling", true)); + m_ui->electricBorderCornerRatio->setValue(qRound(config.readEntry("ElectricBorderCornerRatio", 0.25)*100)); emit changed(false); } @@ -113,6 +115,7 @@ void KWinScreenEdgesConfig::save() config.writeEntry("ElectricBorderCooldown", m_ui->triggerCooldownSpin->value()); config.writeEntry("ElectricBorderMaximize", m_ui->quickMaximizeBox->isChecked()); config.writeEntry("ElectricBorderTiling", m_ui->quickTileBox->isChecked()); + config.writeEntry("ElectricBorderCornerRatio", m_ui->electricBorderCornerRatio->value()/100.0); config.sync(); @@ -132,6 +135,7 @@ void KWinScreenEdgesConfig::defaults() m_ui->triggerCooldownSpin->setValue(350); m_ui->quickMaximizeBox->setChecked(true); m_ui->quickTileBox->setChecked(true); + m_ui->electricBorderCornerRatio->setValue(25); emit changed(true); } diff --git a/kcmkwin/kwinscreenedges/main.ui b/kcmkwin/kwinscreenedges/main.ui index 759f8966c6..6985e8bf6f 100644 --- a/kcmkwin/kwinscreenedges/main.ui +++ b/kcmkwin/kwinscreenedges/main.ui @@ -7,7 +7,7 @@ 0 0 461 - 478 + 511 @@ -51,24 +51,93 @@ Window Management - - - QFormLayout::ExpandingFieldsGrow - - + + Maximize windows by dragging them to the top of the screen - + Tile windows by dragging them to the side of the screen + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + + + + + false + + + Quarter tiling triggered in the outer + + + electricBorderCornerRatio + + + + + + + false + + + % + + + 1 + + + 49 + + + + + + + false + + + of the screen + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + @@ -236,5 +305,54 @@ triggerCooldownSpin - + + + quickTileBox + toggled(bool) + label_3 + setEnabled(bool) + + + 93 + 306 + + + 105 + 329 + + + + + quickTileBox + toggled(bool) + electricBorderCornerRatio + setEnabled(bool) + + + 164 + 312 + + + 301 + 345 + + + + + quickTileBox + toggled(bool) + label_4 + setEnabled(bool) + + + 220 + 305 + + + 340 + 329 + + + +