From 9d49ba6a97a98830b3b4c3d947ad242595231325 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 18 Sep 2018 07:52:44 +0200 Subject: [PATCH 1/6] fixuifiles --- debug_console.ui | 3 --- 1 file changed, 3 deletions(-) diff --git a/debug_console.ui b/debug_console.ui index c13be1881b..cb6cc0ae16 100644 --- a/debug_console.ui +++ b/debug_console.ui @@ -10,9 +10,6 @@ 600 - - Form - From 53ba323f76aa7273bb6be6b7a29e303edd2c213f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 22 Sep 2018 08:04:02 +0200 Subject: [PATCH 2/6] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- plugins/scenes/qpainter/qpainter.json | 2 +- plugins/scenes/xrender/xrender.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/scenes/qpainter/qpainter.json b/plugins/scenes/qpainter/qpainter.json index 6327bbfa75..459ddb27e0 100644 --- a/plugins/scenes/qpainter/qpainter.json +++ b/plugins/scenes/qpainter/qpainter.json @@ -31,7 +31,7 @@ "Description[tr]": "QPainter üzerinden KWin Dizgici eklentisi oluşturma", "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням QPainter", "Description[x-test]": "xxKWin Compositor plugin rendering through QPainterxx", - "Description[zh_CN]": "使用 QPainter 渲染的 KWin 合成插件", + "Description[zh_CN]": "使用 QPainter 渲染的 KWin 混成插件", "Description[zh_TW]": "透過 QPainter 繪製 KWin 合成器附加元件", "Id": "KWinSceneQPainter", "Name": "SceneQPainter", diff --git a/plugins/scenes/xrender/xrender.json b/plugins/scenes/xrender/xrender.json index 1c75605be3..ada3b3bd70 100644 --- a/plugins/scenes/xrender/xrender.json +++ b/plugins/scenes/xrender/xrender.json @@ -31,7 +31,7 @@ "Description[tr]": "XRender üzerinden KWin Dizgici eklentisi oluşturma", "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням XRender", "Description[x-test]": "xxKWin Compositor plugin rendering through XRenderxx", - "Description[zh_CN]": "使用 XRender 渲染的 KWin 合成插件", + "Description[zh_CN]": "使用 XRender 渲染的 KWin 混成插件", "Description[zh_TW]": "透過 XRender 繪製 KWin 合成器附加元件", "Id": "KWinSceneXRender", "Name": "SceneXRender", From eedccae16f8227fc977d1b61f64cbdc58afa0d23 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 23 Sep 2018 07:36:20 +0200 Subject: [PATCH 3/6] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- scripts/synchronizeskipswitcher/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/synchronizeskipswitcher/metadata.desktop b/scripts/synchronizeskipswitcher/metadata.desktop index 33b454fcb7..52734f2a83 100644 --- a/scripts/synchronizeskipswitcher/metadata.desktop +++ b/scripts/synchronizeskipswitcher/metadata.desktop @@ -30,7 +30,7 @@ Name[pa]=ਛੱਡਣ ਸਵਿੱਚਰ ਨੂੰ ਟਾਸਕਬਾਰ ਨਾ Name[pl]=Synchronizuj pomijanie przełącznika z paskiem zadań Name[pt]=Sincronizar o 'Ignorar o Selector' com a Barra de Tarefas Name[pt_BR]=Sincronizar o 'Ignorar seletor' com a barra de tarefas -Name[ru]=Синхронизация переключателя пропусков с панелью задач +Name[ru]=Синхронизация пропускаемых окон в переключателе с панелью задач Name[sk]=Synchronizovať Preskočiť prepínač s taskbarom Name[sl]=Uskladi preskok preklapljanja z opravilno vrstico Name[sr]=Синхронизовано прескакање мењача са траком задатака From 0b8453c62ff287c5009216c8f9d2f3944e826107 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 29 Sep 2018 08:22:49 +0200 Subject: [PATCH 4/6] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- effects/translucency/package/metadata.desktop | 4 ++-- kcmkwin/kwinoptions/kwinadvanced.desktop | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/effects/translucency/package/metadata.desktop b/effects/translucency/package/metadata.desktop index c20654a71b..f852ad1369 100644 --- a/effects/translucency/package/metadata.desktop +++ b/effects/translucency/package/metadata.desktop @@ -34,7 +34,7 @@ Name[hu]=Áttetszőség Name[ia]=Translucentia Name[id]=Translucency Name[is]=Hálfgegnsæi -Name[it]=Traslucenza +Name[it]=Translucenza Name[ja]=半透明 Name[ka]=ნახევრადგამჭირვალეობა Name[kk]=Мөлдірлік @@ -112,7 +112,7 @@ Comment[hu]=Áttetszővé tesz ablakokat bizonyos feltételek teljesülése eset Comment[ia]=On face fenestra translucente sub conditiones differente Comment[id]=Buat jendela translusens di bawah kondisi berbeda Comment[is]=Gerir glugga hálfgegnsæa við ýmis tilefni -Comment[it]=Rende le finestre traslucide in certe condizioni +Comment[it]=Rende le finestre translucide in certe condizioni Comment[ja]=さまざまな状況でウィンドウを半透明にします Comment[kk]=Түрлі жағдайда терезелерді мөлдір қылады Comment[km]=ធ្វើ​ឲ្យ​បង្អួច​ថ្លា​ក្រោមលក្ខខណ្ឌ​ផ្សេងៗ​គ្នា diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop index d2e868ed94..514ca02844 100644 --- a/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -160,7 +160,7 @@ X-KDE-Keywords[gl]=sombra,bordo,beira,pasar,bordos activos,beiras activas,lapela X-KDE-Keywords[hu]=árnyékolás,szegély,lebegés,aktív szegélyek,csempézés,bejárás,ablakbejárás,ablakcsoportosítás,ablakcsempézés,ablakelhelyezés,ablakok elhelyezése,ablak speciális viselkedése X-KDE-Keywords[ia]=umbrar,margine,planante,margines active,con tegulas,schedas,tabbing,tabbing de fenestra,gruppante fenestra,fenestra con tegulas,placiamento de fenestra,placiamento de fenestras, comportamento avantiate de fenestra X-KDE-Keywords[id]=bayangan,batas,melayang,batas aktif,ubin,tab,tab,tab jendela,grup jendela,ubin jendela,penempatan jendela,penempatan jendela,perilaku lanjutan jendela -X-KDE-Keywords[it]=ombreggiatura,bordo,sovrapponi,bordi attivi,affiancatura,schede,navigazione schede,finestre a schede,regruppamento finestre,affaincatura finestre,posizionamento finestre,posizionamento delle finestre,comportamento avanzato delle finestre +X-KDE-Keywords[it]=ombreggiatura,bordo,sovrapponi,bordi attivi,affiancamento,schede,navigazione schede,finestre a schede,raggruppamento finestre,affiancamento finestre,posizionamento finestre,posizionamento delle finestre,comportamento avanzato delle finestre X-KDE-Keywords[kk]=shading,border,hover,active borders,tiling,tabs,tabbing,window tabbing,window grouping,window tiling,window placement,placement of windows,window advanced behavior X-KDE-Keywords[km]=shading,border,hover,active borders,tiling,tabs,tabbing,window tabbing,window grouping,window tiling,window placement,placement of windows,window advanced behavior X-KDE-Keywords[ko]=shading,border,hover,active borders,tiling,tabs,tabbing,window tabbing,window grouping,window tiling,window placement,placement of windows,window advanced behavior,그림자,경계선,호버,지나다니기,타일,탭,창 탭,창 그룹,창 타일,창 위치 From b3e3cf861f070deb4ec06a74f84b24501be303e4 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Thu, 4 Oct 2018 12:25:07 +0100 Subject: [PATCH 5/6] Update version number for 5.14.0 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index da701a59f5..1e63b38ce1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) project(KWIN) -set(PROJECT_VERSION "5.13.90") +set(PROJECT_VERSION "5.14.0") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.11.0") From e9fd57285f31392d0081862122334997d226a918 Mon Sep 17 00:00:00 2001 From: Vlad Zagorodniy Date: Thu, 4 Oct 2018 20:20:55 +0300 Subject: [PATCH 6/6] [effects/zoom] Set wrap mode for cursor texture Summary: With the Oxygen cursor theme, a visual glitch can appear in the bottom-left corner of the cursor when the screen is zoomed in. The reason for that is we're using GL_REPEAT for GL_TEXTURE_WRAP_S and GL_TEXTURE_WRAP_T. So, when the linear filter samples neighboring texels in the bottom, it can sample some texels from the top (because of GL_REPEAT). To fix that, we have to set the wrap mode to GL_CLAMP_TO_EDGE. BUG: 338254 FIXED-IN: 5.14.0 Test Plan: Before: {F6303912} After: {F6303913} Tried other cursor themes(Breeze and Adwaita), everything looks okay. Reviewers: #kwin, davidedmundson Reviewed By: #kwin, davidedmundson Subscribers: davidedmundson, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D15949 --- effects/zoom/zoom.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/effects/zoom/zoom.cpp b/effects/zoom/zoom.cpp index 1868c6bbef..efdec578a0 100644 --- a/effects/zoom/zoom.cpp +++ b/effects/zoom/zoom.cpp @@ -192,8 +192,10 @@ void ZoomEffect::recreateTexture() imageWidth = cursor.image().width(); imageHeight = cursor.image().height(); cursorHotSpot = cursor.hotSpot(); - if (effects->isOpenGLCompositing()) + if (effects->isOpenGLCompositing()) { texture.reset(new GLTexture(cursor.image())); + texture->setWrapMode(GL_CLAMP_TO_EDGE); + } #ifdef KWIN_HAVE_XRENDER_COMPOSITING if (effects->compositingType() == XRenderCompositing) xrenderPicture.reset(new XRenderPicture(cursor.image()));