prepare for 5.16.2

tildearrow · Jun 25, 2019 · 99e7044 · 99e7044
2 parents 4890b64 + e5f0303
commit 99e7044
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 6 deletions.
diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop
@@ -79,6 +79,7 @@ Comment[da]=Indstil vinduets titellinjer og kanter
 Comment[en_GB]=Configure window titlebars and borders
 Comment[es]=Configurar barra de título y bordes de las ventanas
 Comment[eu]=Konfiguratu leihoen titulu-barrak eta ertzak
+Comment[fi]=Ikkunan otsikkopalkkien ja reunojen asetukset
 Comment[fr]=Configure les barres de titre et les bordures de la fenêtre
 Comment[gl]=Configurar as barras de título e os bordos das xanelas
 Comment[id]=Konfigurasikan bingkai dan bilah-judul window

diff --git a/kcmkwin/kwindecoration/package/metadata.desktop b/kcmkwin/kwindecoration/package/metadata.desktop
@@ -81,6 +81,7 @@ Comment[da]=Indstil vinduets titellinjer og kanter
 Comment[en_GB]=Configure window titlebars and borders
 Comment[es]=Configurar barra de título y bordes de las ventanas
 Comment[eu]=Konfiguratu leihoen titulu-barrak eta ertzak
+Comment[fi]=Ikkunan otsikkopalkkien ja reunojen asetukset
 Comment[fr]=Configure les barres de titre et les bordures de la fenêtre
 Comment[gl]=Configurar as barras de título e os bordos das xanelas
 Comment[id]=Konfigurasikan bingkai dan bilah-judul window

diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop
@@ -32,7 +32,7 @@ Name[de]=Fensterverhalten
 Name[el]=Συμπεριφορά παραθύρων
 Name[en_GB]=Window Behaviour
 Name[eo]=Fenestrokonduto
-Name[es]=Comportamiento de la ventana
+Name[es]=Comportamiento de las ventanas
 Name[et]=Akende käitumine
 Name[eu]=Leihoaren portaera
 Name[fa]=رفتار پنجره

diff --git a/kcmkwin/kwinrules/kwinrules.desktop b/kcmkwin/kwinrules/kwinrules.desktop
@@ -22,7 +22,7 @@ Name[da]=Vinduesregler
 Name[de]=Fensterregeln
 Name[el]=Κανόνες παραθύρου
 Name[en_GB]=Window Rules
-Name[es]=Reglas de la ventana
+Name[es]=Reglas de las ventanas
 Name[et]=Akna reeglid
 Name[eu]=Leihoaren arauak
 Name[fi]=Ikkunasäännöt
@@ -126,7 +126,7 @@ X-KDE-Keywords[da]=størrelse,position,tilstand,vinduesopførsel,vinduer,specifi
 X-KDE-Keywords[de]=Größe,Position,Status,Fensterverhalten,Fenster,Regeln
 X-KDE-Keywords[el]=μέγεθος,θέση,κατάσταση,συμπεριφορά παραθύρου,παράθυρα,ειδική,εναλλακτικές,απομνημόνευση,κανόνες
 X-KDE-Keywords[en_GB]=size,position,state,window behaviour,windows,specific,workarounds,remember,rules
-X-KDE-Keywords[es]=tamaño,posición,estado,comportamiento de la ventana,ventanas,específicos,soluciones,recordatorio,reglas
+X-KDE-Keywords[es]=tamaño,posición,estado,comportamiento de las ventanas,ventanas,específicos,soluciones,recordatorio,reglas
 X-KDE-Keywords[et]=suurus,asukoht,olek,akende käitumine,aknad,meeldejätmine,reeglid
 X-KDE-Keywords[eu]=tamaina,posizio,egoera,leihoaren portaera,leihoak,zehatz,konponbide,gogorarazpen,arau
 X-KDE-Keywords[fi]=koko,sijainti,tila,ikkunoiden toiminta,ikkunat,erikoisasetukset,ikkunakohtaiset,korjaukset,muista,muistaminen,säännöt

diff --git a/main_x11.cpp b/main_x11.cpp
@@ -43,6 +43,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QFile>
 #include <QLabel>
 #include <QPushButton>
+#include <QSurfaceFormat>
 #include <QVBoxLayout>
 #include <QX11Info>
 
@@ -417,6 +418,11 @@ KWIN_EXPORT int kdemain(int argc, char * argv[])
     KWin::Application::createAboutData();
     KQuickAddons::QtQuickSettings::init();
 
+    // disables vsync for any QtQuick windows we create (BUG 406180)
+    QSurfaceFormat format = QSurfaceFormat::defaultFormat();
+    format.setSwapInterval(0);
+    QSurfaceFormat::setDefaultFormat(format);
+
     QCommandLineOption replaceOption(QStringLiteral("replace"), i18n("Replace already-running ICCCM2.0-compliant window manager"));
 
     QCommandLineParser parser;

diff --git a/placement.cpp b/placement.cpp
@@ -205,6 +205,10 @@ void Placement::placeSmart(AbstractClient* c, const QRect& area, Policy /*next*/
      * with ideas from xfce.
      */
 
+    if (!c->size().isValid()) {
+        return;
+    }
+
     const int none = 0, h_wrong = -1, w_wrong = -2; // overlap types
     long int overlap, min_overlap = 0;
     int x_optimal, y_optimal;

diff --git a/rules.cpp b/rules.cpp
@@ -938,7 +938,7 @@ void AbstractClient::applyWindowRules()
         workspace()->activateNextClient(this);
     // Closeable
     QSize s = adjustedSize();
-    if (s != size())
+    if (s != size() && s.isValid())
         resizeWithChecks(s);
     // Autogrouping : Only checked on window manage
     // AutogroupInForeground : Only checked on window manage

diff --git a/shadow.cpp b/shadow.cpp
@@ -124,7 +124,7 @@ Shadow *Shadow::createShadowFromWayland(Toplevel *toplevel)
 QVector< uint32_t > Shadow::readX11ShadowProperty(xcb_window_t id)
 {
     QVector<uint32_t> ret;
-    if (id != XCB_WINDOW) {
+    if (id != XCB_WINDOW_NONE) {
         Xcb::Property property(false, id, atoms->kde_net_wm_shadow, XCB_ATOM_CARDINAL, 0, 12);
         uint32_t *shadow = property.value<uint32_t*>();
         if (shadow) {

diff --git a/shell_client.cpp b/shell_client.cpp
@@ -597,7 +597,9 @@ void ShellClient::updateDecoration(bool check_workspace_pos, bool force)
     if (m_xdgDecoration) {
         auto mode = isDecorated() || m_userNoBorder ? XdgDecorationInterface::Mode::ServerSide: XdgDecorationInterface::Mode::ClientSide;
         m_xdgDecoration->configure(mode);
-        m_xdgShellSurface->configure(xdgSurfaceStates(), m_requestedClientSize);
+        if (m_requestGeometryBlockCounter == 0) {
+            m_xdgShellSurface->configure(xdgSurfaceStates(), m_requestedClientSize);
+        }
     }
     getShadow();
     if (check_workspace_pos)