Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kde-gtk-config6 for openSUSE:Factory
checked in at 2025-02-10 17:23:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kde-gtk-config6 (Old)
and /work/SRC/openSUSE:Factory/.kde-gtk-config6.new.21275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kde-gtk-config6"
Mon Feb 10 17:23:32 2025 rev:18 rq:1244570 version:6.3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kde-gtk-config6/kde-gtk-config6.changes
2025-01-03 14:16:16.643832134 +0100
+++
/work/SRC/openSUSE:Factory/.kde-gtk-config6.new.21275/kde-gtk-config6.changes
2025-02-10 18:01:39.176589358 +0100
@@ -1,0 +2,33 @@
+Thu Feb 6 13:46:41 UTC 2025 - Fabian Vogt <[email protected]>
+
+- Update to 6.3.0:
+ * New bugfix release
+ * For more details see https://kde.org/announcements/plasma/6/6.3.0
+- Changes since 6.2.91:
+ * update version for new release
+
+-------------------------------------------------------------------
+Thu Jan 23 13:45:15 UTC 2025 - Fabian Vogt <[email protected]>
+
+- Update to 6.2.91:
+ * New bugfix release
+ * For more details see https://kde.org/announcements/plasma/6/6.2.91
+- Changes since 6.2.90:
+ * update version for new release
+
+-------------------------------------------------------------------
+Sat Jan 11 18:27:11 UTC 2025 - Fabian Vogt <[email protected]>
+
+- Update to 6.2.90:
+ * New feature release
+ * For more details see https://kde.org/announcements/plasma/6/6.2.90
+- Changes since 6.2.5:
+ * update version for new release
+ * adjust to kdecoration changes: add a scale factor and double buffer state
+ * Don't try to create buttons when the factory failed to load
+ * adjust to kdecoration changes
+ * port to KDecoration3
+ * Gracefully handle decoration plugin failing to load
+ * update version for new release
+
+-------------------------------------------------------------------
Old:
----
kde-gtk-config-6.2.5.tar.xz
kde-gtk-config-6.2.5.tar.xz.sig
New:
----
kde-gtk-config-6.3.0.tar.xz
kde-gtk-config-6.3.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kde-gtk-config6.spec ++++++
--- /var/tmp/diff_new_pack.1tzZbx/_old 2025-02-10 18:01:39.672609862 +0100
+++ /var/tmp/diff_new_pack.1tzZbx/_new 2025-02-10 18:01:39.672609862 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kde-gtk-config6
#
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
#
-%define kf6_version 6.5.0
+%define kf6_version 6.10.0
%define qt6_version 6.7.0
%define rname kde-gtk-config
# Full Plasma 6 version (e.g. 6.0.0)
@@ -25,21 +25,21 @@
%{!?_plasma6_version: %define _plasma6_version %(echo %{_plasma6_bugfix} | awk
-F. '{print $1"."$2}')}
%bcond_without released
Name: kde-gtk-config6
-Version: 6.2.5
+Version: 6.3.0
Release: 0
Summary: Daemon for GTK2 and GTK3 Applications Appearance Under KDE
License: GPL-3.0-or-later AND LGPL-3.0-or-later
URL: https://www.kde.org
-Source:
https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz
+Source: %{rname}-%{version}.tar.xz
%if %{with released}
-Source1:
https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz.sig
+Source1: %{rname}-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
BuildRequires: gsettings-desktop-schemas
BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
BuildRequires: pkgconfig
BuildRequires: sassc
-BuildRequires: cmake(KDecoration2) >= %{_plasma6_bugfix}
+BuildRequires: cmake(KDecoration3) >= %{_plasma6_bugfix}
BuildRequires: cmake(KF6Config) >= %{kf6_version}
BuildRequires: cmake(KF6ConfigWidgets) >= %{kf6_version}
BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version}
@@ -103,6 +103,7 @@
%license LICENSES/*
%dir %{_kf6_libdir}/gtk-3.0/
%dir %{_kf6_libdir}/gtk-3.0/modules/
+%{_kf6_debugdir}/kde-gtk-config.categories
%{_kf6_libdir}/gtk-3.0/modules/libcolorreload-gtk-module.so
%{_kf6_libdir}/gtk-3.0/modules/libwindow-decorations-gtk-module.so
%{_kf6_libdir}/kconf_update_bin/gtk_theme
@@ -111,7 +112,6 @@
%{_kf6_sharedir}/kcm-gtk-module/
%{_kf6_sharedir}/kconf_update/gtkconfig.upd
%{_kf6_sharedir}/kconf_update/remove_window_decorations_from_gtk_css.sh
-%{_kf6_debugdir}/kde-gtk-config.categories
%files gtk3
%license LICENSES/*
++++++ kde-gtk-config-6.2.5.tar.xz -> kde-gtk-config-6.3.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-6.2.5/CMakeLists.txt
new/kde-gtk-config-6.3.0/CMakeLists.txt
--- old/kde-gtk-config-6.2.5/CMakeLists.txt 2024-12-30 19:56:48.000000000
+0100
+++ new/kde-gtk-config-6.3.0/CMakeLists.txt 2025-02-06 12:01:28.000000000
+0100
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.16)
project(kde-gtk-config)
-set(PROJECT_VERSION "6.2.5")
+set(PROJECT_VERSION "6.3.0")
set(QT_MIN_VERSION "6.7.0")
-set(KF6_MIN_VERSION "6.5.0")
+set(KF6_MIN_VERSION "6.10.0")
set(KDE_COMPILERSETTINGS_LEVEL "5.82")
set(CMAKE_CXX_STANDARD 20)
@@ -28,7 +28,7 @@
find_package(Qt6 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS DBus Svg)
find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS ColorScheme CoreAddons
Config GuiAddons DBusAddons WindowSystem)
find_package(PkgConfig REQUIRED)
-find_package(KDecoration2 REQUIRED)
+find_package(KDecoration3 REQUIRED)
find_package(GSettingSchemas REQUIRED)
find_package(Sass REQUIRED)
find_package(XSettingsd)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kde-gtk-config-6.2.5/kded/kwin_bridge/CMakeLists.txt
new/kde-gtk-config-6.3.0/kded/kwin_bridge/CMakeLists.txt
--- old/kde-gtk-config-6.2.5/kded/kwin_bridge/CMakeLists.txt 2024-12-30
19:56:48.000000000 +0100
+++ new/kde-gtk-config-6.3.0/kded/kwin_bridge/CMakeLists.txt 2025-02-06
12:01:28.000000000 +0100
@@ -11,9 +11,9 @@
target_link_libraries(KWinBridge
PUBLIC
- KDecoration2::KDecoration
+ KDecoration3::KDecoration
PRIVATE
- KDecoration2::KDecoration2Private
+ KDecoration3::KDecoration3Private
KF6::ColorScheme
KF6::CoreAddons
Qt::Svg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kde-gtk-config-6.2.5/kded/kwin_bridge/decorationpalette.cpp
new/kde-gtk-config-6.3.0/kded/kwin_bridge/decorationpalette.cpp
--- old/kde-gtk-config-6.2.5/kded/kwin_bridge/decorationpalette.cpp
2024-12-30 19:56:48.000000000 +0100
+++ new/kde-gtk-config-6.3.0/kded/kwin_bridge/decorationpalette.cpp
2025-02-06 12:01:28.000000000 +0100
@@ -49,10 +49,10 @@
return m_activeTitleBarColor.isValid();
}
-QColor DecorationPalette::color(KDecoration2::ColorGroup group,
KDecoration2::ColorRole role) const
+QColor DecorationPalette::color(KDecoration3::ColorGroup group,
KDecoration3::ColorRole role) const
{
- using KDecoration2::ColorGroup;
- using KDecoration2::ColorRole;
+ using KDecoration3::ColorGroup;
+ using KDecoration3::ColorRole;
switch (role) {
case ColorRole::Frame:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kde-gtk-config-6.2.5/kded/kwin_bridge/decorationpalette.h
new/kde-gtk-config-6.3.0/kded/kwin_bridge/decorationpalette.h
--- old/kde-gtk-config-6.2.5/kded/kwin_bridge/decorationpalette.h
2024-12-30 19:56:48.000000000 +0100
+++ new/kde-gtk-config-6.3.0/kded/kwin_bridge/decorationpalette.h
2025-02-06 12:01:28.000000000 +0100
@@ -12,7 +12,7 @@
#ifndef KWIN_DECORATION_PALETTE_H
#define KWIN_DECORATION_PALETTE_H
-#include <KDecoration2/DecorationSettings>
+#include <KDecoration3/DecorationSettings>
#include <QFileSystemWatcher>
#include <QPalette>
@@ -28,7 +28,7 @@
bool isValid() const;
- QColor color(KDecoration2::ColorGroup group, KDecoration2::ColorRole role)
const;
+ QColor color(KDecoration3::ColorGroup group, KDecoration3::ColorRole role)
const;
QPalette palette() const;
Q_SIGNALS:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kde-gtk-config-6.2.5/kded/kwin_bridge/dummydecoratedclient.cpp
new/kde-gtk-config-6.3.0/kded/kwin_bridge/dummydecoratedclient.cpp
--- old/kde-gtk-config-6.2.5/kded/kwin_bridge/dummydecoratedclient.cpp
2024-12-30 19:56:48.000000000 +0100
+++ new/kde-gtk-config-6.3.0/kded/kwin_bridge/dummydecoratedclient.cpp
2025-02-06 12:01:28.000000000 +0100
@@ -6,209 +6,226 @@
#include "dummydecoratedclient.h"
-namespace KDecoration2
+namespace KDecoration3
{
-DummyDecoratedClient::DummyDecoratedClient(DecoratedClient *client, Decoration
*decoration)
- : DecoratedClientPrivate(client, decoration)
+DummyDecoratedWindow::DummyDecoratedWindow(DecoratedWindow *client, Decoration
*decoration)
+ : DecoratedWindowPrivate(client, decoration)
, m_pallete(QStringLiteral("kdeglobals"))
, m_maximized()
, m_active(true)
{
}
-bool DummyDecoratedClient::isActive() const
+bool DummyDecoratedWindow::isActive() const
{
return m_active;
}
-QString DummyDecoratedClient::caption() const
+QString DummyDecoratedWindow::caption() const
{
return {};
}
-bool DummyDecoratedClient::isOnAllDesktops() const
+bool DummyDecoratedWindow::isOnAllDesktops() const
{
return true;
}
-bool DummyDecoratedClient::isShaded() const
+bool DummyDecoratedWindow::isShaded() const
{
return true;
}
-QIcon DummyDecoratedClient::icon() const
+QIcon DummyDecoratedWindow::icon() const
{
return {};
}
-bool DummyDecoratedClient::isMaximized() const
+bool DummyDecoratedWindow::isMaximized() const
{
return m_maximized;
}
-bool DummyDecoratedClient::isMaximizedHorizontally() const
+bool DummyDecoratedWindow::isMaximizedHorizontally() const
{
return m_maximized;
}
-bool DummyDecoratedClient::isMaximizedVertically() const
+bool DummyDecoratedWindow::isMaximizedVertically() const
{
return m_maximized;
}
-bool DummyDecoratedClient::isKeepAbove() const
+bool DummyDecoratedWindow::isKeepAbove() const
{
return true;
}
-bool DummyDecoratedClient::isKeepBelow() const
+bool DummyDecoratedWindow::isKeepBelow() const
{
return true;
}
-bool DummyDecoratedClient::isCloseable() const
+bool DummyDecoratedWindow::isCloseable() const
{
return true;
}
-bool DummyDecoratedClient::isMaximizeable() const
+bool DummyDecoratedWindow::isMaximizeable() const
{
return true;
}
-bool DummyDecoratedClient::isMinimizeable() const
+bool DummyDecoratedWindow::isMinimizeable() const
{
return true;
}
-bool DummyDecoratedClient::providesContextHelp() const
+bool DummyDecoratedWindow::providesContextHelp() const
{
return true;
}
-bool DummyDecoratedClient::isModal() const
+bool DummyDecoratedWindow::isModal() const
{
return true;
}
-bool DummyDecoratedClient::isShadeable() const
+bool DummyDecoratedWindow::isShadeable() const
{
return true;
}
-bool DummyDecoratedClient::isMoveable() const
+bool DummyDecoratedWindow::isMoveable() const
{
return true;
}
-bool DummyDecoratedClient::isResizeable() const
+bool DummyDecoratedWindow::isResizeable() const
{
return true;
}
-WId DummyDecoratedClient::windowId() const
+qreal DummyDecoratedWindow::width() const
{
return {};
}
-WId DummyDecoratedClient::decorationId() const
+qreal DummyDecoratedWindow::height() const
{
return {};
}
-int DummyDecoratedClient::width() const
+QSizeF DummyDecoratedWindow::size() const
{
return {};
}
-int DummyDecoratedClient::height() const
-{
- return {};
-}
-
-QSize DummyDecoratedClient::size() const
-{
- return {};
-}
-
-QPalette DummyDecoratedClient::palette() const
+QPalette DummyDecoratedWindow::palette() const
{
return m_pallete.palette();
}
-QColor DummyDecoratedClient::color(ColorGroup group, ColorRole role) const
+QColor DummyDecoratedWindow::color(ColorGroup group, ColorRole role) const
{
return m_pallete.color(group, role);
}
-Qt::Edges DummyDecoratedClient::adjacentScreenEdges() const
+Qt::Edges DummyDecoratedWindow::adjacentScreenEdges() const
{
return {};
}
-QString DummyDecoratedClient::windowClass() const
+QString DummyDecoratedWindow::windowClass() const
{
return {};
}
-void DummyDecoratedClient::requestShowToolTip(const QString &text)
+void DummyDecoratedWindow::requestShowToolTip(const QString &text)
{
Q_UNUSED(text)
}
-void DummyDecoratedClient::requestHideToolTip()
+void DummyDecoratedWindow::requestHideToolTip()
{
}
-void DummyDecoratedClient::requestClose()
+void DummyDecoratedWindow::requestClose()
{
}
-void DummyDecoratedClient::requestToggleMaximization(Qt::MouseButtons buttons)
+void DummyDecoratedWindow::requestToggleMaximization(Qt::MouseButtons buttons)
{
Q_UNUSED(buttons)
m_maximized = !m_maximized;
}
-void DummyDecoratedClient::requestMinimize()
+void DummyDecoratedWindow::requestMinimize()
{
}
-void DummyDecoratedClient::requestContextHelp()
+void DummyDecoratedWindow::requestContextHelp()
{
}
-void DummyDecoratedClient::requestToggleOnAllDesktops()
+void DummyDecoratedWindow::requestToggleOnAllDesktops()
{
}
-void DummyDecoratedClient::requestToggleShade()
+void DummyDecoratedWindow::requestToggleShade()
{
}
-void DummyDecoratedClient::requestToggleKeepAbove()
+void DummyDecoratedWindow::requestToggleKeepAbove()
{
}
-void DummyDecoratedClient::requestToggleKeepBelow()
+void DummyDecoratedWindow::requestToggleKeepBelow()
{
}
-void DummyDecoratedClient::requestShowWindowMenu(const QRect &rect)
+void DummyDecoratedWindow::requestShowWindowMenu(const QRect &rect)
{
Q_UNUSED(rect)
}
-void DummyDecoratedClient::setMaximized(bool maximized)
+bool DummyDecoratedWindow::hasApplicationMenu() const
+{
+ return false;
+}
+
+bool DummyDecoratedWindow::isApplicationMenuActive() const
+{
+ return false;
+}
+
+void DummyDecoratedWindow::showApplicationMenu(int actionId)
+{
+}
+
+void DummyDecoratedWindow::requestShowApplicationMenu(const QRect &rect, int
actionId)
+{
+}
+
+void DummyDecoratedWindow::setMaximized(bool maximized)
{
m_maximized = maximized;
}
-void DummyDecoratedClient::setActive(bool active)
+void DummyDecoratedWindow::setActive(bool active)
{
m_active = active;
}
+qreal DummyDecoratedWindow::scale() const
+{
+ return 1;
+}
+
+qreal DummyDecoratedWindow::nextScale() const
+{
+ return 1;
+}
}
#include "moc_dummydecoratedclient.cpp"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kde-gtk-config-6.2.5/kded/kwin_bridge/dummydecoratedclient.h
new/kde-gtk-config-6.3.0/kded/kwin_bridge/dummydecoratedclient.h
--- old/kde-gtk-config-6.2.5/kded/kwin_bridge/dummydecoratedclient.h
2024-12-30 19:56:48.000000000 +0100
+++ new/kde-gtk-config-6.3.0/kded/kwin_bridge/dummydecoratedclient.h
2025-02-06 12:01:28.000000000 +0100
@@ -6,19 +6,19 @@
#pragma once
-#include <KDecoration2/Private/DecoratedClientPrivate>
+#include <KDecoration3/Private/DecoratedWindowPrivate>
#include <QPalette>
#include "decorationpalette.h"
-namespace KDecoration2
+namespace KDecoration3
{
-class DummyDecoratedClient : public QObject, public DecoratedClientPrivate
+class DummyDecoratedWindow : public QObject, public DecoratedWindowPrivate
{
Q_OBJECT
public:
- DummyDecoratedClient(DecoratedClient *client, Decoration *decoration);
+ DummyDecoratedWindow(DecoratedWindow *client, Decoration *decoration);
bool isActive() const override;
QString caption() const override;
@@ -40,12 +40,9 @@
bool isMoveable() const override;
bool isResizeable() const override;
- WId windowId() const override;
- WId decorationId() const override;
-
- int width() const override;
- int height() const override;
- QSize size() const override;
+ qreal width() const override;
+ qreal height() const override;
+ QSizeF size() const override;
QPalette palette() const override;
QColor color(ColorGroup group, ColorRole role) const override;
Qt::Edges adjacentScreenEdges() const override;
@@ -64,6 +61,14 @@
void requestToggleKeepBelow() override;
void requestShowWindowMenu(const QRect &rect) override;
+ bool hasApplicationMenu() const override;
+ bool isApplicationMenuActive() const override;
+ void showApplicationMenu(int actionId) override;
+ void requestShowApplicationMenu(const QRect &rect, int actionId) override;
+
+ qreal scale() const override;
+ qreal nextScale() const override;
+
void setMaximized(bool maximized);
void setActive(bool active);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kde-gtk-config-6.2.5/kded/kwin_bridge/dummydecorationbridge.cpp
new/kde-gtk-config-6.3.0/kded/kwin_bridge/dummydecorationbridge.cpp
--- old/kde-gtk-config-6.2.5/kded/kwin_bridge/dummydecorationbridge.cpp
2024-12-30 19:56:48.000000000 +0100
+++ new/kde-gtk-config-6.3.0/kded/kwin_bridge/dummydecorationbridge.cpp
2025-02-06 12:01:28.000000000 +0100
@@ -9,10 +9,10 @@
#include <QMouseEvent>
#include <KConfigGroup>
-#include <KDecoration2/DecoratedClient>
-#include <KDecoration2/DecorationSettings>
-#include <KDecoration2/Private/DecoratedClientPrivate>
-#include <KDecoration2/Private/DecorationSettingsPrivate>
+#include <KDecoration3/DecoratedWindow>
+#include <KDecoration3/DecorationSettings>
+#include <KDecoration3/Private/DecoratedWindowPrivate>
+#include <KDecoration3/Private/DecorationSettingsPrivate>
#include <KPluginFactory>
#include <KPluginMetaData>
#include <KSharedConfig>
@@ -23,7 +23,7 @@
#include "dummydecorationbridge.h"
#include "dummydecorationsettings.h"
-namespace KDecoration2
+namespace KDecoration3
{
DummyDecorationBridge::DummyDecorationBridge(const QString &decorationTheme,
QObject *parent)
: DecorationBridge(parent)
@@ -53,12 +53,14 @@
if (m_factory) {
const QVariantMap args({{QStringLiteral("bridge"),
QVariant::fromValue(this)}});
- m_decoration = m_factory->create<KDecoration2::Decoration>(m_factory,
QVariantList({args}));
+ m_decoration = m_factory->create<KDecoration3::Decoration>(m_factory,
QVariantList({args}));
if (m_decoration) {
- auto decorationSettings =
std::make_shared<KDecoration2::DecorationSettings>(this);
+ auto decorationSettings =
std::make_shared<KDecoration3::DecorationSettings>(this);
m_decoration->setSettings(decorationSettings);
+ m_decoration->create();
m_decoration->init();
+ m_decoration->apply(m_decoration->nextState()->clone());
// Update decoration settings, e.g. Breeze's "Draw a circle around
close button"
if (m_settings) {
@@ -78,17 +80,17 @@
m_pluginLoader.unload();
}
-std::unique_ptr<KDecoration2::DecorationSettingsPrivate>
DummyDecorationBridge::settings(KDecoration2::DecorationSettings *parent)
+std::unique_ptr<KDecoration3::DecorationSettingsPrivate>
DummyDecorationBridge::settings(KDecoration3::DecorationSettings *parent)
{
auto newSettings = std::unique_ptr<DummyDecorationSettings>(new
DummyDecorationSettings(parent));
m_settings = newSettings.get();
return newSettings;
}
-std::unique_ptr<KDecoration2::DecoratedClientPrivate>
DummyDecorationBridge::createClient(KDecoration2::DecoratedClient *client,
-
KDecoration2::Decoration *decoration)
+std::unique_ptr<KDecoration3::DecoratedWindowPrivate>
DummyDecorationBridge::createClient(KDecoration3::DecoratedWindow *client,
+
KDecoration3::Decoration *decoration)
{
- auto ptr = std::unique_ptr<DummyDecoratedClient>(new
DummyDecoratedClient(client, decoration));
+ auto ptr = std::unique_ptr<DummyDecoratedWindow>(new
DummyDecoratedWindow(client, decoration));
m_client = ptr.get();
return ptr;
}
@@ -100,8 +102,8 @@
}
disableAnimations();
- std::unique_ptr<KDecoration2::DecorationButton> button{
- m_factory->create<KDecoration2::DecorationButton>(m_decoration,
+ std::unique_ptr<KDecoration3::DecorationButton> button{
+ m_factory->create<KDecoration3::DecorationButton>(m_decoration,
QVariantList({
QVariant::fromValue(strToButtonType(buttonType)),
QVariant::fromValue(m_decoration),
@@ -118,7 +120,7 @@
// For example Breeze uses 'checked' property, but Oxygen uses
client's 'isMaximized' method
button->setChecked(true);
if (m_client) {
- dynamic_cast<DummyDecoratedClient *>(m_client)->setMaximized(true);
+ dynamic_cast<DummyDecoratedWindow *>(m_client)->setMaximized(true);
}
}
@@ -130,11 +132,11 @@
if (buttonState.contains(QStringLiteral("backdrop"))) {
if (m_client) {
- dynamic_cast<DummyDecoratedClient *>(m_client)->setActive(false);
+ dynamic_cast<DummyDecoratedWindow *>(m_client)->setActive(false);
}
} else {
if (m_client) {
- dynamic_cast<DummyDecoratedClient *>(m_client)->setActive(true);
+ dynamic_cast<DummyDecoratedWindow *>(m_client)->setActive(true);
}
}
@@ -170,7 +172,7 @@
QString DummyDecorationBridge::windowDecorationPluginPath(const QString
&decorationTheme) const
{
- const auto decorationPlugins =
KPluginMetaData::findPlugins(QStringLiteral("org.kde.kdecoration2"));
+ const auto decorationPlugins =
KPluginMetaData::findPlugins(QStringLiteral("org.kde.kdecoration3"));
QString defaultPluginPath;
@@ -186,7 +188,7 @@
return defaultPluginPath;
}
-void
DummyDecorationBridge::passMouseHoverEventToButton(KDecoration2::DecorationButton
*button) const
+void
DummyDecorationBridge::passMouseHoverEventToButton(KDecoration3::DecorationButton
*button) const
{
QHoverEvent event{QEvent::HoverEnter,
{
@@ -201,7 +203,7 @@
QCoreApplication::instance()->sendEvent(button, &event);
}
-void
DummyDecorationBridge::passMousePressEventToButton(KDecoration2::DecorationButton
*button) const
+void
DummyDecorationBridge::passMousePressEventToButton(KDecoration3::DecorationButton
*button) const
{
QMouseEvent event{QEvent::MouseButtonPress,
{
@@ -214,14 +216,14 @@
QCoreApplication::instance()->sendEvent(button, &event);
}
-KDecoration2::DecorationButtonType
DummyDecorationBridge::strToButtonType(const QString &type) const
+KDecoration3::DecorationButtonType
DummyDecorationBridge::strToButtonType(const QString &type) const
{
if (type == QStringLiteral("minimize")) {
- return KDecoration2::DecorationButtonType::Minimize;
+ return KDecoration3::DecorationButtonType::Minimize;
} else if (type == QStringLiteral("close")) {
- return KDecoration2::DecorationButtonType::Close;
+ return KDecoration3::DecorationButtonType::Close;
} else {
- return KDecoration2::DecorationButtonType::Maximize;
+ return KDecoration3::DecorationButtonType::Maximize;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kde-gtk-config-6.2.5/kded/kwin_bridge/dummydecorationbridge.h
new/kde-gtk-config-6.3.0/kded/kwin_bridge/dummydecorationbridge.h
--- old/kde-gtk-config-6.2.5/kded/kwin_bridge/dummydecorationbridge.h
2024-12-30 19:56:48.000000000 +0100
+++ new/kde-gtk-config-6.3.0/kded/kwin_bridge/dummydecorationbridge.h
2025-02-06 12:01:28.000000000 +0100
@@ -9,17 +9,16 @@
#include <QPluginLoader>
#include <QString>
-#include <KDecoration2/Decoration>
-#include <KDecoration2/Private/DecorationBridge>
-#include <kdecoration2/decorationdefines.h>
-
+#include <KDecoration3/Decoration>
+#include <KDecoration3/Private/DecorationBridge>
+#include <kdecoration3/decorationdefines.h>
class KPluginFactory;
-namespace KDecoration2
+namespace KDecoration3
{
class DecorationSettings;
-class DecoratedClientPrivate;
+class DecoratedWindowPrivate;
class DecorationSettingsPrivate;
class DummyDecorationSettings;
@@ -30,8 +29,8 @@
DummyDecorationBridge(const QString &decorationTheme, QObject *parent =
nullptr);
~DummyDecorationBridge() override;
- std::unique_ptr<KDecoration2::DecorationSettingsPrivate>
settings(KDecoration2::DecorationSettings *parent) override;
- std::unique_ptr<KDecoration2::DecoratedClientPrivate>
createClient(KDecoration2::DecoratedClient *client, KDecoration2::Decoration
*decoration) override;
+ std::unique_ptr<KDecoration3::DecorationSettingsPrivate>
settings(KDecoration3::DecorationSettings *parent) override;
+ std::unique_ptr<KDecoration3::DecoratedWindowPrivate>
createClient(KDecoration3::DecoratedWindow *client, KDecoration3::Decoration
*decoration) override;
void paintButton(QPainter &painter, const QString &buttonType, const
QString &buttonState);
@@ -41,19 +40,19 @@
QString windowDecorationPluginPath(const QString &decorationTheme) const;
- void passMouseHoverEventToButton(KDecoration2::DecorationButton *button)
const;
- void passMousePressEventToButton(KDecoration2::DecorationButton *button)
const;
+ void passMouseHoverEventToButton(KDecoration3::DecorationButton *button)
const;
+ void passMousePressEventToButton(KDecoration3::DecorationButton *button)
const;
- KDecoration2::DecorationButtonType strToButtonType(const QString &type)
const;
+ KDecoration3::DecorationButtonType strToButtonType(const QString &type)
const;
QString m_decorationsConfigFileName;
double globalAnimationEntryValue;
QPluginLoader m_pluginLoader;
KPluginFactory *m_factory;
- KDecoration2::Decoration *m_decoration;
- KDecoration2::DecoratedClientPrivate *m_client;
- KDecoration2::DummyDecorationSettings *m_settings;
+ KDecoration3::Decoration *m_decoration;
+ KDecoration3::DecoratedWindowPrivate *m_client;
+ KDecoration3::DummyDecorationSettings *m_settings;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kde-gtk-config-6.2.5/kded/kwin_bridge/dummydecorationsettings.cpp
new/kde-gtk-config-6.3.0/kded/kwin_bridge/dummydecorationsettings.cpp
--- old/kde-gtk-config-6.2.5/kded/kwin_bridge/dummydecorationsettings.cpp
2024-12-30 19:56:48.000000000 +0100
+++ new/kde-gtk-config-6.3.0/kded/kwin_bridge/dummydecorationsettings.cpp
2025-02-06 12:01:28.000000000 +0100
@@ -5,7 +5,7 @@
*/
#include "dummydecorationsettings.h"
-namespace KDecoration2
+namespace KDecoration3
{
DummyDecorationSettings::DummyDecorationSettings(DecorationSettings *parent)
: DecorationSettingsPrivate(parent)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kde-gtk-config-6.2.5/kded/kwin_bridge/dummydecorationsettings.h
new/kde-gtk-config-6.3.0/kded/kwin_bridge/dummydecorationsettings.h
--- old/kde-gtk-config-6.2.5/kded/kwin_bridge/dummydecorationsettings.h
2024-12-30 19:56:48.000000000 +0100
+++ new/kde-gtk-config-6.3.0/kded/kwin_bridge/dummydecorationsettings.h
2025-02-06 12:01:28.000000000 +0100
@@ -6,12 +6,12 @@
#pragma once
-#include <KDecoration2/DecorationSettings>
-#include <KDecoration2/Private/DecorationSettingsPrivate>
+#include <KDecoration3/DecorationSettings>
+#include <KDecoration3/Private/DecorationSettingsPrivate>
-namespace KDecoration2
+namespace KDecoration3
{
-class DummyDecorationSettings : public KDecoration2::DecorationSettingsPrivate
+class DummyDecorationSettings : public KDecoration3::DecorationSettingsPrivate
{
public:
explicit DummyDecorationSettings(DecorationSettings *parent);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kde-gtk-config-6.2.5/kded/kwin_bridge/standarddecorationpainter.cpp
new/kde-gtk-config-6.3.0/kded/kwin_bridge/standarddecorationpainter.cpp
--- old/kde-gtk-config-6.2.5/kded/kwin_bridge/standarddecorationpainter.cpp
2024-12-30 19:56:48.000000000 +0100
+++ new/kde-gtk-config-6.3.0/kded/kwin_bridge/standarddecorationpainter.cpp
2025-02-06 12:01:28.000000000 +0100
@@ -8,7 +8,7 @@
StandardDecorationPainter::StandardDecorationPainter(const QString &themeName)
: DecorationPainter()
- , m_bridge(new KDecoration2::DummyDecorationBridge(themeName))
+ , m_bridge(new KDecoration3::DummyDecorationBridge(themeName))
{
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kde-gtk-config-6.2.5/kded/kwin_bridge/standarddecorationpainter.h
new/kde-gtk-config-6.3.0/kded/kwin_bridge/standarddecorationpainter.h
--- old/kde-gtk-config-6.2.5/kded/kwin_bridge/standarddecorationpainter.h
2024-12-30 19:56:48.000000000 +0100
+++ new/kde-gtk-config-6.3.0/kded/kwin_bridge/standarddecorationpainter.h
2025-02-06 12:01:28.000000000 +0100
@@ -18,5 +18,5 @@
void paintButton(QPainter &painter, const QString &buttonType, const
QString &buttonState) const override;
private:
- std::unique_ptr<KDecoration2::DummyDecorationBridge> m_bridge;
+ std::unique_ptr<KDecoration3::DummyDecorationBridge> m_bridge;
};
