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

Merge branch 'Plasma/5.14'

Browse source
This commit is contained in:
Vlad Zagorodniy 2018-10-04 21:41:38 +03:00
commit 0e50a9d55c
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
debug_console.ui
View file

@ -10,9 +10,6 @@
<height>600</height> <height>600</height>
</rect> </rect>
</property> </property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">

4
effects/zoom/zoom.cpp
View file

@ -192,8 +192,10 @@ void ZoomEffect::recreateTexture()
imageWidth = cursor.image().width(); imageWidth = cursor.image().width();
imageHeight = cursor.image().height(); imageHeight = cursor.image().height();
cursorHotSpot = cursor.hotSpot(); cursorHotSpot = cursor.hotSpot();
if (effects->isOpenGLCompositing()) if (effects->isOpenGLCompositing()) {
texture.reset(new GLTexture(cursor.image())); texture.reset(new GLTexture(cursor.image()));
texture->setWrapMode(GL_CLAMP_TO_EDGE);
}
#ifdef KWIN_HAVE_XRENDER_COMPOSITING #ifdef KWIN_HAVE_XRENDER_COMPOSITING
if (effects->compositingType() == XRenderCompositing) if (effects->compositingType() == XRenderCompositing)
xrenderPicture.reset(new XRenderPicture(cursor.image())); xrenderPicture.reset(new XRenderPicture(cursor.image()));

2
plugins/scenes/qpainter/qpainter.json
View file

@ -31,7 +31,7 @@
"Description[tr]": "QPainter üzerinden KWin Dizgici eklentisi oluşturma", "Description[tr]": "QPainter üzerinden KWin Dizgici eklentisi oluşturma",
"Description[uk]": "Додаток засобу композиції KWin для обробки з використанням QPainter", "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням QPainter",
"Description[x-test]": "xxKWin Compositor plugin rendering through QPainterxx", "Description[x-test]": "xxKWin Compositor plugin rendering through QPainterxx",
"Description[zh_CN]": "使用 QPainter 渲染的 KWin 合成插件", "Description[zh_CN]": "使用 QPainter 渲染的 KWin 混成插件",
"Description[zh_TW]": "透過 QPainter 繪製 KWin 合成器附加元件", "Description[zh_TW]": "透過 QPainter 繪製 KWin 合成器附加元件",
"Id": "KWinSceneQPainter", "Id": "KWinSceneQPainter",
"Name": "SceneQPainter", "Name": "SceneQPainter",

2
plugins/scenes/xrender/xrender.json
View file

@ -31,7 +31,7 @@
"Description[tr]": "XRender üzerinden KWin Dizgici eklentisi oluşturma", "Description[tr]": "XRender üzerinden KWin Dizgici eklentisi oluşturma",
"Description[uk]": "Додаток засобу композиції KWin для обробки з використанням XRender", "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням XRender",
"Description[x-test]": "xxKWin Compositor plugin rendering through XRenderxx", "Description[x-test]": "xxKWin Compositor plugin rendering through XRenderxx",
"Description[zh_CN]": "使用 XRender 渲染的 KWin 合成插件", "Description[zh_CN]": "使用 XRender 渲染的 KWin 混成插件",
"Description[zh_TW]": "透過 XRender 繪製 KWin 合成器附加元件", "Description[zh_TW]": "透過 XRender 繪製 KWin 合成器附加元件",
"Id": "KWinSceneXRender", "Id": "KWinSceneXRender",
"Name": "SceneXRender", "Name": "SceneXRender",