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

0.8.1

Browse Source 
+ Add Qt6 version
This commit is contained in:
Jan Grulich 2021-11-10 12:51:55 +01:00
parent dccd16fed1
commit f13fb28ab5
4 changed files with 58 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,3 +10,4 @@
/QGnomePlatform-0.7.0.tar.gz
/QGnomePlatform-0.7.1.tar.gz
/QGnomePlatform-0.8.0.tar.gz
/QGnomePlatform-0.8.1.tar.gz

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

@ -1,8 +1,8 @@
diff --git a/src/decoration/qgnomeplatformdecoration.cpp b/src/decoration/qgnomeplatformdecoration.cpp
index 1129b4f..be4ac21 100644
index a719cb3..1346a01 100644
--- a/src/decoration/qgnomeplatformdecoration.cpp
+++ b/src/decoration/qgnomeplatformdecoration.cpp
@@ -178,7 +178,7 @@ QMargins QGnomePlatformDecoration::margins(MarginsType marginsType) const
@@ -180,7 +180,7 @@ QMargins QGnomePlatformDecoration::margins(MarginsType marginsType) const
#else
QMargins QGnomePlatformDecoration::margins() const
{
@ -10,8 +10,8 @@ index 1129b4f..be4ac21 100644
+ if ((waylandWindow()->windowStates() & Qt::WindowMaximized)) {
return QMargins(0, TITLEBAR_HEIGHT, 0, 0);
}
@@ -371,7 +371,7 @@ void QGnomePlatformDecoration::paint(QPaintDevice *device)
@@ -373,7 +373,7 @@ void QGnomePlatformDecoration::paint(QPaintDevice *device)
// * *
// ********************************
QPainterPath borderRect;
@ -20,7 +20,7 @@ index 1129b4f..be4ac21 100644
borderRect.addRoundedRect(0, 0, surfaceRect.width(), margins().top() + 8, 10, 10);
p.fillPath(borderRect.simplified(), borderColor);
}
@@ -389,7 +389,7 @@ void QGnomePlatformDecoration::paint(QPaintDevice *device)
@@ -391,7 +391,7 @@ void QGnomePlatformDecoration::paint(QPaintDevice *device)
// * *
// ********************************
QPainterPath roundedRect;
@ -29,7 +29,7 @@ index 1129b4f..be4ac21 100644
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);
@@ -412,7 +412,7 @@ void QGnomePlatformDecoration::paint(QPaintDevice *device)
@@ -414,7 +414,7 @@ void QGnomePlatformDecoration::paint(QPaintDevice *device)
// *| |*
// *------------------------------*
// ********************************
@ -38,12 +38,12 @@ index 1129b4f..be4ac21 100644
QPainterPath borderPath;
// Left
borderPath.addRect(0, margins().top(), margins().left(), surfaceRect.height() - margins().top() - WINDOW_BORDER_WIDTH);
@@ -522,7 +522,7 @@ void QGnomePlatformDecoration::paint(QPaintDevice *device)
Adwaita::Renderer::renderFlatRoundedButtonFrame(styleOptions);
}
decorationButtonStyle.setRect(QRect(static_cast<int>(rect.x()) + (BUTTON_WIDTH / 4), static_cast<int>(rect.y()) + (BUTTON_WIDTH / 4), BUTTON_WIDTH / 2, BUTTON_WIDTH / 2));
- const Adwaita::ButtonType buttonType = (window()->windowStates() & Qt::WindowMaximized) ? Adwaita::ButtonType::ButtonRestore : Adwaita::ButtonType::ButtonMaximize;
+ const Adwaita::ButtonType buttonType = (waylandWindow()->windowStates() & Qt::WindowMaximized) ? Adwaita::ButtonType::ButtonRestore : Adwaita::ButtonType::ButtonMaximize;
Adwaita::Renderer::renderDecorationButton(decorationButtonStyle, buttonType);
@@ -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);
}

52
qgnomeplatform.spec
View File

@ -1,8 +1,8 @@
Name: qgnomeplatform
Version: 0.8.0
Release: 4%{?dist}
Summary: Qt Platform Theme aimed to accommodate Gnome settings
Version: 0.8.1
Release: 1%{?dist}
Summary: Qt5 Platform Theme aimed to accommodate Gnome settings
License: LGPLv2+
URL: https://github.com/MartinBriza/QGnomePlatform
@ -19,42 +19,74 @@ BuildRequires: gtk3-devel
BuildRequires: gsettings-desktop-schemas-devel
BuildRequires: libinput-devel
BuildRequires: libXrender-devel
BuildRequires: qt5-qtbase-devel >= 5.12.0
BuildRequires: qt5-qtbase-static >= 5.12.0
BuildRequires: qt5-qtwayland-devel >= 5.12.0
BuildRequires: qt5-qtbase-devel >= 5.15.2
BuildRequires: qt5-qtbase-static >= 5.15.2
BuildRequires: qt5-qtwayland-devel >= 5.15.2
BuildRequires: libadwaita-qt5-devel >= 1.3.1
BuildRequires: qt6-qtbase-devel >= 6.2.0
BuildRequires: qt6-qtbase-static >= 6.2.0
BuildRequires: qt6-qtwayland-devel >= 6.2.0
BuildRequires: qt6-qtbase-private-devel >= 6.2.0
BuildRequires: libadwaita-qt5-devel >= 1.4.1
Requires: adwaita-qt5%{?_isa}
BuildRequires: libadwaita-qt6-devel >= 1.4.1
BuildRequires: qt5-qtbase-private-devel
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
%description
QGnomePlatform is a Qt Platform Theme aimed to accommodate as much of
QGnomePlatform is a Qt5 Platform Theme aimed to accommodate as much of
GNOME settings as possibleand utilize them in Qt applications without
modifying them - making them fit into the environment as well as possible.
%package -n qgnomeplatform-qt6
Summary: Qt6 Platform Theme aimed to accommodate Gnome settings
%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}}
Requires: adwaita-qt6%{?_isa}
%description -n qgnomeplatform-qt6
QGnomePlatform is a Qt6 Platform Theme aimed to accommodate as much of
GNOME settings as possibleand utilize them in Qt applications without
modifying them - making them fit into the environment as well as possible.
%prep
%autosetup -p1 -n QGnomePlatform-%{version}
%build
%global _vpath_builddir %{_target_platform}-qt5
%cmake
%cmake_build
%global _vpath_builddir %{_target_platform}-qt6
%cmake -DUSE_QT6=true
%cmake_build
%install
%global _vpath_builddir %{_target_platform}-qt5
%cmake_install
%global _vpath_builddir %{_target_platform}-qt6
%cmake_install
%files
%doc README.md
%license LICENSE
%{_qt5_libdir}/libqgnomeplatform.so
%{_qt5_libdir}/qt5/plugins/platformthemes/libqgnomeplatformtheme.so
%{_qt5_libdir}/qt5/plugins/wayland-decoration-client/libqgnomeplatformdecoration.so
%{_qt5_plugindir}/platformthemes/libqgnomeplatformtheme.so
%{_qt5_plugindir}/wayland-decoration-client/libqgnomeplatformdecoration.so
%files -n qgnomeplatform-qt6
%{_qt6_libdir}/libqgnomeplatform6.so
%{_qt6_plugindir}/platformthemes/libqgnomeplatformtheme.so
%{_qt6_plugindir}/wayland-decoration-client/libqgnomeplatformdecoration.so
%changelog
* Wed Nov 10 2021 Jan Grulich <jgrulich@redhat.com> - 0.8.1-1
- 0.8.1
+ Add Qt6 version
* Tue Sep 07 2021 Jan Grulich <jgrulich@redhat.com> - 0.8.0-4
- Disable decoration shadows because of a Qt bug

2
sources
View File

@ -1 +1 @@
SHA512 (QGnomePlatform-0.8.0.tar.gz) = e862b84024ad77976b52cbacf1f920acaa60d2bfcb8f261f1215f2e5fb2dbe6d99e10aa425be70fa2dd324ac4d8c5b85958d68fae4fb7f9728caf097aa1bd102
SHA512 (QGnomePlatform-0.8.1.tar.gz) = d7b3253b9fcf2a1a6e320d069a6425aa78981a7f19609166b7f53fe1882e19a12fca7326265af091e6335c2ebc1f6492c5262428831e7fd8635ced23439a959f