yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://anongit.kde.org/kde-workspace

Browse source
This commit is contained in:
Hugo Pereira Da Costa 2012-06-07 12:30:37 -07:00
commit 4e995b79af
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
kcmkwin/kwindecoration/kwindecoration.cpp
View file

@ -377,7 +377,10 @@ void KWinDecorationModule::updatePreviews()
const int h = m_ui->decorationList->rootObject()->property("contentHeight").toInt();
const int y = m_ui->decorationList->rootObject()->property("contentY").toInt();
// start at first element in sight
m_model->regeneratePreviews(y*m_model->rowCount()/h);
int row = 0;
if (h > 0)
row = qMin(qMax(0, y*m_model->rowCount()/h), m_model->rowCount());
m_model->regeneratePreviews(row);
}
void KWinDecorationModule::updatePreviewWidth()

2
scripting/scriptedeffect.cpp
View file

@ -147,7 +147,7 @@ ScriptedEffect::ScriptedEffect()
{
connect(m_engine, SIGNAL(signalHandlerException(QScriptValue)), SLOT(signalHandlerException(QScriptValue)));
#ifdef KWIN_BUILD_SCREENEDGES
connect(Workspace::self()->screenEdge(), SIGNAL(activated(ElectricBorder)), SLOT(borderActivated(ElectricBorder)));
connect(Workspace::self()->screenEdge(), SIGNAL(activated(ElectricBorder)), SLOT(slotBorderActivated(ElectricBorder)));
#endif
}