diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-09-03 20:56:28 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-09-03 20:56:28 +0100 |
commit | fbda87924e6faa7a1919f1a2b4182490bde5ec5c (patch) | |
tree | f3114a4ed212a754756adce027aeef3a4a1a2e2a /kde-apps/konsole/files | |
parent | 3b08f674e3f771b49370edb144dab0958c8cf721 (diff) |
gentoo resync : 03.09.2021
Diffstat (limited to 'kde-apps/konsole/files')
3 files changed, 0 insertions, 201 deletions
diff --git a/kde-apps/konsole/files/konsole-21.08.0-fix-KXmlGUI-toolbars-and-MainWindow-size.patch b/kde-apps/konsole/files/konsole-21.08.0-fix-KXmlGUI-toolbars-and-MainWindow-size.patch deleted file mode 100644 index fc62466ea627..000000000000 --- a/kde-apps/konsole/files/konsole-21.08.0-fix-KXmlGUI-toolbars-and-MainWindow-size.patch +++ /dev/null @@ -1,73 +0,0 @@ -From fb7f838fd3138a39aea3bcb2e91f923741587137 Mon Sep 17 00:00:00 2001 -From: Ahmad Samir <a.samirh78@gmail.com> -Date: Thu, 29 Jul 2021 18:44:07 +0200 -Subject: [PATCH] Fix KXmlGUI toolbars; and Konsole MainWindow size - -Call setupGUI(), which will call createGUI (since we set the -KXmlGuiWindow::Create flag), omit the StatusBar flag since we don't have a -statusbar and don't want the "Show StatusBar" menu action. - -TabbedViewContainer::sizeHint() calculates an optimum size for itself, -including the sizes of its child widgets; added in efb621d091c05f11 by -Mariusz Glebocki; following the code: -MainWindow creates a ViewManager -ViewManager creates a TabbedViewContainer and then a TerminalDisplay - -which means that the first time TabbedViewContainer::sizeHint() is called -the TerminalDisplay widget size is 0, then TabbedViewContainer::sizeHint() -would return 0. - -Which is why calling resize() in MainWindow was delayed to the showEvent(), -(and even delayed more by a QTimer::singleShot() call in Application), -at which point all the child widgets have been created and -MainWindow::sizeHint() (which logically takes into account the sizeHint() -of its child widgets) would return a sensible size. - -CCBUG: 430036 -CCBUG: 439339 -BUG: 436471 - - -(cherry picked from commit 090356661c92bfedeeeaf6f4f77d294facb3d8c6) ---- - src/MainWindow.cpp | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp -index c67acf8b9..a4b36b61d 100644 ---- a/src/MainWindow.cpp -+++ b/src/MainWindow.cpp -@@ -131,8 +131,10 @@ MainWindow::MainWindow() : - // in terminal applications - KAcceleratorManager::setNoAccel(menuBar()); - -- // create menus -- createGUI(); -+ constexpr KXmlGuiWindow::StandardWindowOptions guiOpts = ToolBar | Keys | Save | Create; -+ const QString xmlFile = componentName() + QLatin1String("ui.rc"); // Typically "konsoleui.rc" -+ // The "Create" flag will make it call createGUI() -+ setupGUI(guiOpts, xmlFile); - - // remember the original menu accelerators for later use - rememberMenuAccelerators(); -@@ -945,9 +947,14 @@ void MainWindow::showEvent(QShowEvent *event) - menuBar()->setVisible(_menuBarInitialVisibility); - _toggleMenuBarAction->setChecked(_menuBarInitialVisibility); - _menuBarInitialVisibilityApplied = true; -- if (!KonsoleSettings::saveGeometryOnExit()) { -- resize(sizeHint()); -- } -+ } -+ -+ if (!KonsoleSettings::saveGeometryOnExit()) { -+ // Delay resizing to here, so that the other parts of the UI -+ // (ViewManager, TabbedViewContainer, TerminalDisplay ... etc) -+ // have been created and TabbedViewContainer::sizeHint() returns -+ // a usuable size. -+ resize(sizeHint()); - } - - // Call parent method --- -GitLab - diff --git a/kde-apps/konsole/files/konsole-21.08.0-fix-MainWindow-size-w-o-saved-size.patch b/kde-apps/konsole/files/konsole-21.08.0-fix-MainWindow-size-w-o-saved-size.patch deleted file mode 100644 index 48fe1be666af..000000000000 --- a/kde-apps/konsole/files/konsole-21.08.0-fix-MainWindow-size-w-o-saved-size.patch +++ /dev/null @@ -1,79 +0,0 @@ -From c78edfbac49852cec40efd5cbe73c341bc06c5ab Mon Sep 17 00:00:00 2001 -From: Ahmad Samir <a.samirh78@gmail.com> -Date: Thu, 29 Jul 2021 18:45:45 +0200 -Subject: [PATCH] Fix MainWindow size when there is no saved size - -The very first time a user runs Konsole, where is no konsolerc file in $HOME, -there is no saved size to restore, instead use the sizeHint(), which ideally -will be the size set in the default profile (based on lines/columns setting). - -CCBUG: 437791 ---- - src/MainWindow.cpp | 21 +++++++++++++++------ - src/MainWindow.h | 1 + - 2 files changed, 16 insertions(+), 6 deletions(-) - -diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp -index a4b36b61d..9b025c8fe 100644 ---- a/src/MainWindow.cpp -+++ b/src/MainWindow.cpp -@@ -70,13 +70,22 @@ MainWindow::MainWindow() : - _menuBarInitialVisibility(true), - _menuBarInitialVisibilityApplied(false) - { -- if (!KonsoleSettings::saveGeometryOnExit()) { -+ KSharedConfigPtr konsoleConfig = KSharedConfig::openConfig(QStringLiteral("konsolerc")); -+ KConfigGroup cg = konsoleConfig->group(QStringLiteral("MainWindow")); -+ const bool isGroup = cg.exists(); -+ if (isGroup) { -+ const QString stateConfig = cg.readEntry(QStringLiteral("State")); -+ -+ // If "stateConfig" is empty then this is the very first run, -+ // i.e. no konsolerc file in $HOME -+ _isSavedUiState = !stateConfig.isEmpty(); -+ } -+ -+ if (isGroup && !KonsoleSettings::saveGeometryOnExit()) { - // If we are not using the global Konsole save geometry on exit, - // remove all geometry data from [MainWindow] in Konsolerc, so KWin will - // manage it directly -- KSharedConfigPtr konsoleConfig = KSharedConfig::openConfig(QStringLiteral("konsolerc")); -- KConfigGroup group = konsoleConfig->group("MainWindow"); -- QMap<QString, QString> configEntries = group.entryMap(); -+ QMap<QString, QString> configEntries = cg.entryMap(); - QMapIterator<QString, QString> i(configEntries); - - while (i.hasNext()) { -@@ -93,7 +102,7 @@ MainWindow::MainWindow() : - || i.key().contains(QLatin1String(" YPosition")) - #endif - ) { -- group.deleteEntry(i.key()); -+ cg.deleteEntry(i.key()); - } - } - } -@@ -949,7 +958,7 @@ void MainWindow::showEvent(QShowEvent *event) - _menuBarInitialVisibilityApplied = true; - } - -- if (!KonsoleSettings::saveGeometryOnExit()) { -+ if (!_isSavedUiState || !KonsoleSettings::saveGeometryOnExit()) { - // Delay resizing to here, so that the other parts of the UI - // (ViewManager, TabbedViewContainer, TerminalDisplay ... etc) - // have been created and TabbedViewContainer::sizeHint() returns -diff --git a/src/MainWindow.h b/src/MainWindow.h -index a80674012..876a81d71 100644 ---- a/src/MainWindow.h -+++ b/src/MainWindow.h -@@ -200,6 +200,7 @@ private: - bool _menuBarInitialVisibility; - bool _menuBarInitialVisibilityApplied; - bool _blurEnabled = false; -+ bool _isSavedUiState = false; - }; - } - --- -GitLab - diff --git a/kde-apps/konsole/files/konsole-21.08.0-fix-crash-w-blur.patch b/kde-apps/konsole/files/konsole-21.08.0-fix-crash-w-blur.patch deleted file mode 100644 index b0c7193eda84..000000000000 --- a/kde-apps/konsole/files/konsole-21.08.0-fix-crash-w-blur.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f24dd6acc28393ba6f731be1360731c01a9a1ef0 Mon Sep 17 00:00:00 2001 -From: Ahmad Samir <a.samirh78@gmail.com> -Date: Fri, 16 Jul 2021 21:37:51 +0200 -Subject: [PATCH] Fix crash when setting blur effect - -Basically to use QWidget::windowHandle() to get a QWindow*, we need to first -set the Qt::WA_NativeWindow attribute on the QWidget. See: -https://phabricator.kde.org/D23108 - -BUG: 439871 -FIXED-IN: 21.12 -(cherry picked from commit a6b2bd539162b39191e827566b656bd97266ffad) ---- - src/MainWindow.cpp | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp -index ed5d8cc3d..c67acf8b9 100644 ---- a/src/MainWindow.cpp -+++ b/src/MainWindow.cpp -@@ -56,6 +56,8 @@ - #include "terminalDisplay/TerminalDisplay.h" - #include "widgets/ViewContainer.h" - -+#include <konsoledebug.h> -+ - using namespace Konsole; - - MainWindow::MainWindow() : -@@ -889,7 +891,15 @@ void MainWindow::setBlur(bool blur) - #if KWINDOWSYSTEM_VERSION < QT_VERSION_CHECK(5,82,0) - KWindowEffects::enableBlurBehind(winId(), blur); - #else -- KWindowEffects::enableBlurBehind(windowHandle(), blur); -+ // Set the WA_NativeWindow attribute to force the creation of the QWindow. -+ // Without this QWidget::windowHandle() returns 0. -+ // See https://phabricator.kde.org/D23108 -+ setAttribute(Qt::WA_NativeWindow); -+ if (QWindow *window = windowHandle()) { -+ KWindowEffects::enableBlurBehind(window, blur); -+ } else { -+ qCWarning(KonsoleDebug) << "Blur effect couldn't be enabled."; -+ } - #endif - } - } --- -GitLab - |