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

Merge branch 'Plasma/5.2'

Browse source
This commit is contained in:
Martin Gräßlin 2015-01-13 08:46:54 +01:00
commit 32cea73843
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
effects/startupfeedback/startupfeedback.cpp
View file

@ -197,7 +197,12 @@ void StartupFeedbackEffect::paintScreen(int mask, QRegion region, ScreenPaintDat
}
} else {
useShader = true;
ShaderManager::instance()->pushShader(ShaderManager::SimpleShader);
auto s = ShaderManager::instance()->pushShader(ShaderTrait::MapTexture);
QMatrix4x4 mvp;
const QSize size = effects->virtualScreenSize();
mvp.ortho(0, size.width(), size.height(), 0, 0, 65535);
mvp.translate(m_currentGeometry.x(), m_currentGeometry.y());
s->setUniform(GLShader::ModelViewProjectionMatrix, mvp);
}
texture->render(m_currentGeometry, m_currentGeometry);
if (useShader) {

8
main.cpp
View file

@ -312,10 +312,10 @@ void Application::registerDBusService()
void Application::setupTranslator()
{
QTranslator qtTranslator;
qtTranslator.load("qt_" + QLocale::system().name(),
QLibraryInfo::location(QLibraryInfo::TranslationsPath));
installTranslator(&qtTranslator);
QTranslator *qtTranslator = new QTranslator(qApp);
qtTranslator->load("qt_" + QLocale::system().name(),
QLibraryInfo::location(QLibraryInfo::TranslationsPath));
installTranslator(qtTranslator);
}
void Application::setupMalloc()