diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-12-05 02:47:11 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-05 02:47:11 +0000 |
commit | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch) | |
tree | c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /kde-apps/konsole/files | |
parent | e9d044d4b9b71200a96adfa280848858c0f468c9 (diff) |
gentoo resync : 05.12.2021
Diffstat (limited to 'kde-apps/konsole/files')
4 files changed, 0 insertions, 242 deletions
diff --git a/kde-apps/konsole/files/konsole-21.04.3-default-navigation-be-TabbedNavigation.patch b/kde-apps/konsole/files/konsole-21.04.3-default-navigation-be-TabbedNavigation.patch deleted file mode 100644 index 0eeaef378990..000000000000 --- a/kde-apps/konsole/files/konsole-21.04.3-default-navigation-be-TabbedNavigation.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e693f2d7f1977ca227589154a5cd8c18d8ce44b7 Mon Sep 17 00:00:00 2001 -From: Ahmad Samir <a.samirh78@gmail.com> -Date: Wed, 1 Sep 2021 11:38:29 +0200 -Subject: [PATCH] The default navigation method should be TabbedNavigation - -TabbedNavigation is when we have a MainWindow, i.e. the typical use case; -whereas NoNavigation is when using Konsole Part. The code in Part calls -setNavigationMethod(NoNavigation), so things should work as before. - -I made a wrong assumption that TabbedNavigation was already the default. - -CCBUG: 432077 ---- - src/ViewManager.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp -index 2ba77e9f0..3ffbe6ba0 100644 ---- a/src/ViewManager.cpp -+++ b/src/ViewManager.cpp -@@ -52,7 +52,7 @@ ViewManager::ViewManager(QObject *parent, KActionCollection *collection) : - _pluggedController(nullptr), - _sessionMap(QHash<TerminalDisplay *, Session *>()), - _actionCollection(collection), -- _navigationMethod(NoNavigation), -+ _navigationMethod(TabbedNavigation), - _navigationVisibility(NavigationNotSet), - _managerId(0), - _terminalDisplayHistoryIndex(-1) --- -GitLab - diff --git a/kde-apps/konsole/files/konsole-21.04.3-dont-close-window-while-split.patch b/kde-apps/konsole/files/konsole-21.04.3-dont-close-window-while-split.patch deleted file mode 100644 index 20762b109574..000000000000 --- a/kde-apps/konsole/files/konsole-21.04.3-dont-close-window-while-split.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 2591a9489a4d3a43c7a7f00764e9f84822d4946c Mon Sep 17 00:00:00 2001 -From: Ahmad Samir <a.samirh78@gmail.com> -Date: Sun, 15 Aug 2021 15:51:33 +0200 -Subject: [PATCH] When closing a session, don't close the whole window if there - are splits - -When closing a session, we check if that is the last tab, and make the code -close the whole window, but we also need to make sure it's the last view, -i.e. no split views. - -CCBUG: 440976 -FIXED-IN: 21.08.1 -(cherry picked from commit 4a3cab03f5d853f4dd48531979fc3fb57dde5e2e) ---- - src/ViewManager.cpp | 6 +++--- - src/widgets/ViewContainer.cpp | 9 +++++++++ - src/widgets/ViewContainer.h | 6 ++++++ - 3 files changed, 18 insertions(+), 3 deletions(-) - -diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp -index 9c006e2bd..426040b78 100644 ---- a/src/ViewManager.cpp -+++ b/src/ViewManager.cpp -@@ -494,9 +494,9 @@ void ViewManager::sessionFinished() - return; - } - -- // The last session/tab? emit empty() so that close() is called in -- // MainWindow, fixes #432077 -- if (_viewContainer->count() == 1) { -+ // The last session/tab, and only one view (no splits), emit empty() -+ // so that close() is called in MainWindow, fixes #432077 -+ if (_viewContainer->count() == 1 && _viewContainer->currentTabViewCount() == 1) { - Q_EMIT empty(); - return; - } -diff --git a/src/widgets/ViewContainer.cpp b/src/widgets/ViewContainer.cpp -index 2d7bfd13b..b25c00cdd 100644 ---- a/src/widgets/ViewContainer.cpp -+++ b/src/widgets/ViewContainer.cpp -@@ -145,6 +145,15 @@ ViewSplitter *TabbedViewContainer::viewSplitterAt(int index) - return qobject_cast<ViewSplitter*>(widget(index)); - } - -+int TabbedViewContainer::currentTabViewCount() -+{ -+ if (auto *splitter = activeViewSplitter()) { -+ return splitter->findChildren<TerminalDisplay*>().count(); -+ } -+ -+ return 1; -+} -+ - void TabbedViewContainer::moveTabToWindow(int index, QWidget *window) - { - auto splitter = viewSplitterAt(index); -diff --git a/src/widgets/ViewContainer.h b/src/widgets/ViewContainer.h -index 3cbacf2cf..8e0a0986a 100644 ---- a/src/widgets/ViewContainer.h -+++ b/src/widgets/ViewContainer.h -@@ -135,6 +135,12 @@ public: - */ - ViewSplitter *viewSplitterAt(int index); - -+ /** -+ * Returns the number of split views (i.e. TerminalDisplay widgets) -+ * in this tab; if there are no split views, 1 is returned. -+ */ -+ int currentTabViewCount(); -+ - void connectTerminalDisplay(TerminalDisplay *display); - void disconnectTerminalDisplay(TerminalDisplay *display); - void moveTabLeft(); --- -GitLab - diff --git a/kde-apps/konsole/files/konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch b/kde-apps/konsole/files/konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch deleted file mode 100644 index d02846ace5aa..000000000000 --- a/kde-apps/konsole/files/konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2684bc7fa5ac0b740b3e8661c3a0ae0136fde0a7 Mon Sep 17 00:00:00 2001 -From: Ahmad Samir <a.samirh78@gmail.com> -Date: Sun, 22 Aug 2021 20:02:52 +0200 -Subject: [PATCH] Only emit empty() in SessionFinished() when in - TabbedNavigation mode - -empty() is emitted so that MainWindow calls close() and we get rid of the -colours-flashing bug when closing the last session/tab in a window, see -commit bbec72250d080. However all that isn't relevant when we are in -konsole Part mode, where there are no tabs or MainWindows. - -This fixes a crash in Dolphin when closing its window while the embedded -Konsole Part is open. The crash would happen as calling -ViewContainer::currentTabViewCount() would end up in the ViewSplitter code -path, which is no-op in Konsole Part. - -To test: -- Open dolphin, make sure the terminal panel isn't open to begin with -- open the terminal panel -- close the dolphin window while the terminal panel is open - -BUG: 441206 -FIXED-IN: 21.08.1 ---- - src/ViewManager.cpp | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp -index 92d2951fc..2ba77e9f0 100644 ---- a/src/ViewManager.cpp -+++ b/src/ViewManager.cpp -@@ -494,11 +494,13 @@ void ViewManager::sessionFinished() - return; - } - -- // The last session/tab, and only one view (no splits), emit empty() -- // so that close() is called in MainWindow, fixes #432077 -- if (_viewContainer->count() == 1 && _viewContainer->currentTabViewCount() == 1) { -- Q_EMIT empty(); -- return; -+ if (_navigationMethod == TabbedNavigation) { -+ // The last session/tab, and only one view (no splits), emit empty() -+ // so that close() is called in MainWindow, fixes #432077 -+ if (_viewContainer->count() == 1 && _viewContainer->currentTabViewCount() == 1) { -+ Q_EMIT empty(); -+ return; -+ } - } - - auto *session = qobject_cast<Session *>(sender()); --- -GitLab - diff --git a/kde-apps/konsole/files/konsole-21.04.3-no-flash-on-session-close.patch b/kde-apps/konsole/files/konsole-21.04.3-no-flash-on-session-close.patch deleted file mode 100644 index d8b14f2f1660..000000000000 --- a/kde-apps/konsole/files/konsole-21.04.3-no-flash-on-session-close.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 302c16791935cc3cf262aee355afce13d694b00f Mon Sep 17 00:00:00 2001 -From: Ahmad Samir <a.samirh78@gmail.com> -Date: Thu, 12 Aug 2021 13:58:20 +0200 -Subject: [PATCH] Prevent window "flashing" when closing the last session - -There are two scenarios when closing a window: -A) clicking the close button on the title bar (or Ctrl+Shift+Q): -~MainWindow() -~ViewManager() -~TabbedViewContainer() -~TerminalDisplay() -~Session() - -B) closing the last session/tab in a window: -SessionController::sessionFinished() -~Session() -~TerminalDisplay() -~TabbedViewContainer() -~MainWindow() -~ViewManager() - -the issue with the second case is that the TerminalDisplay is torn down -first, which exposes the TabbedViewContainer widget, the latter has the same -Qt::Window colour as the system colour scheme window background colour, if -you're using a dark terminal colour scheme and a light-coloured system colour -scheme, you could see some "flashing" when you close the last session with -e.g. Ctrl+D. - -To fix this, in sessionFinished() check if TabbedViewContainer::count() is -1 (i.e. closing last tab/session), and emit the empty() signal in that case, -which is connected to MainwWindow::close(), then the order of tear down -becomes: -SessionController::sessionFinished() -~Session() -~MainWindow() -~ViewManager() -~TabbedViewContainer() -~TerminalDisplay() - -BUG: 432077 -FIXED-IN: 21.12 -(cherry picked from commit bbec72250d080ce286a6762fb9beee4b6e7981c9) ---- - src/MainWindow.cpp | 2 +- - src/ViewManager.cpp | 7 +++++++ - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp -index cc38b3990..0fae334de 100644 ---- a/src/MainWindow.cpp -+++ b/src/MainWindow.cpp -@@ -102,7 +102,7 @@ MainWindow::MainWindow() : - - // create view manager - _viewManager = new ViewManager(this, actionCollection()); -- connect(_viewManager, &Konsole::ViewManager::empty, this, &Konsole::MainWindow::close); -+ connect(_viewManager, &Konsole::ViewManager::empty, this, &QWidget::close); - connect(_viewManager, &Konsole::ViewManager::activeViewChanged, this, - &Konsole::MainWindow::activeViewChanged); - connect(_viewManager, &Konsole::ViewManager::unplugController, this, -diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp -index 751684dc8..4d33a4cf8 100644 ---- a/src/ViewManager.cpp -+++ b/src/ViewManager.cpp -@@ -461,6 +461,13 @@ void ViewManager::sessionFinished() - return; - } - -+ // The last session/tab? emit empty() so that close() is called in -+ // MainWindow, fixes #432077 -+ if (_viewContainer->count() == 1) { -+ Q_EMIT empty(); -+ return; -+ } -+ - auto *session = qobject_cast<Session *>(sender()); - Q_ASSERT(session); - --- -GitLab - |