rpms/qgnomeplatform
7
0
Fork 0
Code Issues Pull Requests Releases Activity

0.9.0

Browse Source
This commit is contained in:
Jan Grulich 2022-09-21 10:10:19 +02:00
parent e37c50d3d1
commit 234177d13e
4 changed files with 10 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -14,3 +14,4 @@
/QGnomePlatform-0.8.2.tar.gz
/QGnomePlatform-0.8.3.tar.gz
/QGnomePlatform-0.8.4.tar.gz
/QGnomePlatform-0.9.0.tar.gz

49
qgnomeplatform-use-more-updated-window-states-value.patch
View File

@ -1,49 +0,0 @@
diff --git a/src/decoration/qgnomeplatformdecoration.cpp b/src/decoration/qgnomeplatformdecoration.cpp
index a719cb3..1346a01 100644
--- a/src/decoration/qgnomeplatformdecoration.cpp
+++ b/src/decoration/qgnomeplatformdecoration.cpp
@@ -180,7 +180,7 @@ QMargins QGnomePlatformDecoration::margins(MarginsType marginsType) const
#else
QMargins QGnomePlatformDecoration::margins() const
{
- if ((window()->windowStates() & Qt::WindowMaximized)) {
+ if ((waylandWindow()->windowStates() & Qt::WindowMaximized)) {
return QMargins(0, TITLEBAR_HEIGHT, 0, 0);
}
@@ -373,7 +373,7 @@ void QGnomePlatformDecoration::paint(QPaintDevice *device)
// * *
// ********************************
QPainterPath borderRect;
- if (!(window()->windowStates() & Qt::WindowMaximized)) {
+ if (!(waylandWindow()->windowStates() & Qt::WindowMaximized)) {
borderRect.addRoundedRect(0, 0, surfaceRect.width(), margins().top() + 8, 10, 10);
p.fillPath(borderRect.simplified(), borderColor);
}
@@ -391,7 +391,7 @@ void QGnomePlatformDecoration::paint(QPaintDevice *device)
// * *
// ********************************
QPainterPath roundedRect;
- if ((window()->windowStates() & Qt::WindowMaximized)) {
+ if ((waylandWindow()->windowStates() & Qt::WindowMaximized)) {
roundedRect.addRect(0, 0, surfaceRect.width(), margins().top() + 8);
} else {
roundedRect.addRoundedRect(WINDOW_BORDER_WIDTH, WINDOW_BORDER_WIDTH, surfaceRect.width() - margins().left() - margins().right(), margins().top() + 8, 8, 8);
@@ -414,7 +414,7 @@ void QGnomePlatformDecoration::paint(QPaintDevice *device)
// *| |*
// *------------------------------*
// ********************************
- if (!(window()->windowStates() & Qt::WindowMaximized)) {
+ if (!(waylandWindow()->windowStates() & Qt::WindowMaximized)) {
QPainterPath borderPath;
// Left
borderPath.addRect(0, margins().top(), margins().left(), surfaceRect.height() - margins().top() - WINDOW_BORDER_WIDTH);
@@ -498,7 +498,7 @@ void QGnomePlatformDecoration::paint(QPaintDevice *device)
// Maximize button
if (GnomeSettings::titlebarButtons().testFlag(GnomeSettings::MaximizeButton)) {
- renderButton(&p, maximizeButtonRect(), (window()->windowStates() & Qt::WindowMaximized) ? Adwaita::ButtonType::ButtonRestore : Adwaita::ButtonType::ButtonMaximize,
+ renderButton(&p, maximizeButtonRect(), (waylandWindow()->windowStates() & Qt::WindowMaximized) ? Adwaita::ButtonType::ButtonRestore : Adwaita::ButtonType::ButtonMaximize,
m_maximizeButtonHovered && active, m_clicking == Button::Maximize || m_clicking == Button::Restore);
}

16
qgnomeplatform.spec
View File

@ -1,14 +1,13 @@
Name: qgnomeplatform
Version: 0.8.4
Release: 13%{?dist}
Version: 0.9.0
Release: 1%{?dist}
Summary: Qt Platform Theme aimed to accommodate Gnome settings
License: LGPLv2+
URL: https://github.com/MartinBriza/QGnomePlatform
Source0: https://github.com/MartinBriza/QGnomePlatform/archive/%{version}/QGnomePlatform-%{version}.tar.gz
URL: https://github.com/FedoraQt/QGnomePlatform
Source0: https://github.com/FedoraQt/QGnomePlatform/archive/%{version}/QGnomePlatform-%{version}.tar.gz
# Upstream patches
# Patch0: qgnomeplatform-use-more-updated-window-states-value.patch
BuildRequires: make
BuildRequires: pkgconfig(gio-2.0)
@ -32,9 +31,7 @@ BuildRequires: qt5-qtwayland-devel >= 5.15.2
BuildRequires: qt5-qtbase-private-devel >= 5.15.2
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
BuildRequires: libadwaita-qt5-devel >= 1.4.1
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
BuildRequires: libadwaita-qt5-devel >= 1.4.2
Requires: adwaita-qt5%{?_isa}
%if (0%{?fedora} && 0%{?fedora} <= 38)
@ -106,6 +103,9 @@ modifying them - making them fit into the environment as well as possible.
%{_qt6_plugindir}/wayland-decoration-client/libqgnomeplatformdecoration.so
%changelog
* Wed Sep 21 2022 Jan Grulich <jgrulich@redhat.com> - 0.9.0-1
- 0.9.0
* Wed Sep 21 2022 Jan Grulich <jgrulich@redhat.com> - 0.8.4-13
- Rebuild (qt5)

2
sources
View File

@ -1 +1 @@
SHA512 (QGnomePlatform-0.8.4.tar.gz) = e5bb5feae401bca145c4b7a4fc18f5a589e2acba20b9ce7d04a7dd1b1734741daf210ff8fba5e03ef5e4ad07efd274a1279e61b359f319b52e3b9bc4d49f9142
SHA512 (QGnomePlatform-0.9.0.tar.gz) = 7671b0659959ede79e47a821481a14ed861418f364d3d0b48789b1edfcf3b84f2aa658e3afce95730a841fdb018ebad38474a83268bd43b1ccfb653ef7e314aa