[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdevplatform/5.0] shell: Fix Title Flickering on Document Change
From:       Andreas Cord-Landwehr <cordlandwehr () kde ! org>
Date:       2016-07-12 19:07:01
Message-ID: E1bN31J-0003ED-7a () code ! kde ! org
[Download RAW message or body]

Git commit 386991aa25e527e8314aabbc283b69381bf0597f by Andreas Cord-Landwehr.
Committed on 12/07/2016 at 19:06.
Pushed by cordlandwehr into branch '5.0'.

Fix Title Flickering on Document Change

Summary:
Use new option from KF5 24 to disable KPart's title handling.
This prevents KPart to act on changed KTextEditor documents by
setting a title different to the one KDevelop wants to set.

Test Plan: Manual testing.

Reviewers: #kdevelop, kfunk

Subscribers: kdevelop-devel

Differential Revision: https://phabricator.kde.org/D2125

M  +7    -1    shell/mainwindow.cpp

http://commits.kde.org/kdevplatform/386991aa25e527e8314aabbc283b69381bf0597f

diff --git a/shell/mainwindow.cpp b/shell/mainwindow.cpp
index cf1b15d..d4ee1a4 100644
--- a/shell/mainwindow.cpp
+++ b/shell/mainwindow.cpp
@@ -40,6 +40,7 @@ Boston, MA 02110-1301, USA.
 #include <KWindowSystem>
 #include <KXMLGUIFactory>
 #include <KColorScheme>
+#include <kparts_version.h>
 
 #include <sublime/area.h>
 #include "shellextension.h"
@@ -95,13 +96,18 @@ void MainWindow::applyMainWindowSettings(const KConfigGroup& config)
 
 void MainWindow::createGUI(KParts::Part* part)
 {
+    //TODO remove if-clause once KF5 >= 5.24 is required
+#if KPARTS_VERSION_MINOR >= 24
+    Sublime::MainWindow::setWindowTitleHandling(false);
+    Sublime::MainWindow::createGUI(part);
+#else
     Sublime::MainWindow::createGUI(part);
-
     if (part) {
         // Don't let the Part control the main window caption -- we take care of that
         disconnect(part, SIGNAL(setWindowCaption(QString)),
                    this, SLOT(setCaption(QString)));
     }
+#endif
 }
 
 void MainWindow::initializeCorners()
[prev in list] [next in list] [prev in thread] [next in thread]