rpm/breeze
SHA256
1
0
Fork 0
forked from pool/breeze
Code Pull Requests Activity

Accepting request 812298 from KDE:Frameworks5

Browse Source 
Plasma 5.19.0

OBS-URL: https://build.opensuse.org/request/show/812298
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/breeze?expand=0&rev=102
This commit is contained in:
Dominique Leuenberger 2020-06-08 21:51:37 +00:00 committed by Git OBS Bridge
commit 7deac229c6
9 changed files with 64 additions and 1507 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
add-support-for-Q3ListView-to-the-KDE4-style.patch
View File

@ -1,92 +0,0 @@
diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
index 8a02d75..c1b9670 100644
--- a/kstyle/breezestyle.cpp
+++ b/kstyle/breezestyle.cpp
@@ -929,6 +929,7 @@ namespace Breeze
case CC_ToolButton: fcn = &Style::drawToolButtonComplexControl; break;
case CC_ComboBox: fcn = &Style::drawComboBoxComplexControl; break;
case CC_SpinBox: fcn = &Style::drawSpinBoxComplexControl; break;
+ case CC_Q3ListView: fcn = &Style::drawQ3ListViewComplexControl; break;
case CC_Slider: fcn = &Style::drawSliderComplexControl; break;
case CC_Dial: fcn = &Style::drawDialComplexControl; break;
case CC_ScrollBar: fcn = &Style::drawScrollBarComplexControl; break;
@@ -6122,6 +6216,67 @@ namespace Breeze
}
//______________________________________________________________
+ bool Style::drawQ3ListViewComplexControl( const QStyleOptionComplex* option, QPainter* painter, const QWidget* widget ) const
+ {
+
+ const QStyleOptionQ3ListView* optListView( qstyleoption_cast<const QStyleOptionQ3ListView*>( option ) );
+ if( !optListView ) return true;
+
+ // this is copied from skulpture code
+ // Copyright ( c ) 2007-2010 Christoph Feck <christoph@maxiom.de>
+ if( optListView->subControls & QStyle::SC_Q3ListView )
+ {
+ painter->fillRect(
+ optListView->rect,
+ optListView->viewportPalette.brush( optListView->viewportBGRole ) );
+ }
+
+ if( optListView->subControls & QStyle::SC_Q3ListViewBranch )
+ {
+
+ QStyleOption opt = *static_cast<const QStyleOption*>( option );
+ int y = optListView->rect.y();
+
+ for ( int i = 1; i < optListView->items.size(); ++i )
+ {
+ QStyleOptionQ3ListViewItem item = optListView->items.at( i );
+ if( y + item.totalHeight > 0 && y < optListView->rect.height() )
+ {
+ opt.state = QStyle::State_Item;
+ if ( i + 1 < optListView->items.size() )
+ { opt.state |= QStyle::State_Sibling; }
+
+ if(
+ item.features & QStyleOptionQ3ListViewItem::Expandable
+ || ( item.childCount > 0 && item.height > 0 ) )
+ { opt.state |= QStyle::State_Children | ( item.state & QStyle::State_Open ); }
+
+ opt.rect = QRect( optListView->rect.left(), y, optListView->rect.width(), item.height );
+ painter->save();
+ drawIndicatorBranchPrimitive( &opt, painter, widget );
+ painter->restore();
+
+ if( ( opt.state & QStyle::State_Sibling ) && item.height < item.totalHeight )
+ {
+ opt.state = QStyle::State_Sibling;
+ opt.rect = QRect(
+ optListView->rect.left(), y + item.height,
+ optListView->rect.width(), item.totalHeight - item.height );
+ painter->save();
+ drawIndicatorBranchPrimitive( &opt, painter, widget );
+ painter->restore();
+ }
+ }
+
+ y += item.totalHeight;
+ }
+ }
+
+ return true;
+
+ }
+
+ //______________________________________________________________
bool Style::drawSliderComplexControl( const QStyleOptionComplex* option, QPainter* painter, const QWidget* widget ) const
{
diff --git a/kstyle/breezestyle.h b/kstyle/breezestyle.h
index a627252..dcbfe4a 100644
--- a/kstyle/breezestyle.h
+++ b/kstyle/breezestyle.h
@@ -320,6 +320,7 @@ namespace Breeze
bool drawToolButtonComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const;
bool drawComboBoxComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const;
bool drawSpinBoxComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const;
+ bool drawQ3ListViewComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const;
bool drawSliderComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const;
bool drawDialComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const;
bool drawScrollBarComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const;

3
breeze-5.18.5.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1d08dfd24df4a4fcacad1e3759e559e82f6014ba63dc75dc32a24de6cd133563
size 21583276

11
breeze-5.18.5.tar.xz.sig
View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl6xeMMACgkQ7JTRj38F
mX7JUAf9G5icQic7JM28txw+ZhgdASv2xgX7NTl5M4oBa1E01QihmewfyeXBd2pK
N67WX+e/g79EJpi6KuM0gGckiax4KCPA3VzeGjel5rY0S6UMNTLOH+HBzVuHzqyF
8ySxKKnNDJBrG2xecVCQgtrejRIcqJjPdJyUb4v8kNqDFMFwC1SOmylIbKhzOKDo
rtYP3y55L90Tdzxeb8bPpZ9mCNDTzlhWJ2zaUvVawRKy5bZTRZ1/QMFBoTT4p0BC
ITQ73h+Pkl2Awu9hLMkySKIlsyXFUm4z7O2r3fLynC5NjtKd8R9ngcjZINKVObxR
9gCXXiBBGMSsQyAVoGJuFsE+4U9+5w==
=VNts
-----END PGP SIGNATURE-----

3
breeze-5.19.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2bf2abce3fb12abf1da79a417a40218cdf7cd089591dccf8ca0e2614671046f6
size 22763360

11
breeze-5.19.0.tar.xz.sig Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl7Y1SwACgkQ7JTRj38F
mX4RqwgAtsyBFw5LrUrSmGK1oVxk/p/J/sQiTLgUdUQTLuXiWo+qBQLGPrXIL6+2
9gM9coL15aY/K8cOGD1H/1Kic9UXc8WcKRP6Cf8C5cbxrC0NRkVuvk0Kkv7BnlaH
DwEFQWRl6GtBJ38ZL6rVynoI2bKoW1Ts5zwLYt4Xpkhf++/DyUDEZ6duBeZlAznD
aOOwS0dRuBi9eL+cz3+DDkYr/RiAVb9QubMqGJxTfX06cbMtGMYGuJRmr2ZBsiZN
fIjRUpC9MbUgwqrCPXrhitUM10doKawQcKotLRm4QkCBR3qitZXo0ermdr/IuUZs
5a8mBR6rkFAyzVD8/nce2MqqqiE2QQ==
=fSii
-----END PGP SIGNATURE-----

47
breeze.changes
View File

@ -1,3 +1,50 @@
-------------------------------------------------------------------
Thu Jun 4 13:27:10 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.19.0
* New bugfix release
* For more details please see:
* https://www.kde.org/announcements/plasma-5.19.0.php
- Changes since 5.18.90:
* [kstyle] Ensure that shadows are destroyed after decorated windows
* [style] Reparent window shadows to widgets
-------------------------------------------------------------------
Thu May 14 14:33:01 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.18.90
* New feature release
* For more details please see:
* https://www.kde.org/announcements/plasma-5.18.90.php
- Changes since 5.18.5:
* Add mobile-friendly versions
* Revert unnecessary wallpaper plugin name change
* Use "Flow" wallpaper for Plasma 5.19
* Phrase active window titlebar separator option more accurately (kde#420753)
* Use the same icon mode calculation for comboboxes as for buttons
* Fix variable mixup
* Don't set a custom palette if we have the same palette as the currently active one
* Drop QWindow and explicit devicePixelRatio usage for ComboBox
* Color icons in titlebar if possible
* Apply the correct palette to icons
* Remove unused methods
* Add missing includes
* [kstyle] Properly unregister widgets in ShadowHelper
* [kstyle] Use QX11Info::isCompositingManagerRunning()
* [kstyle] Drop Helper::connection()
* [kstyle] Unregister a shadow when it's destroyed (kde#416854)
* Update my last name
* Delete unused property name
* Port connections to new syntax
* now that qt4 was dropped we can use specific ECM/Qt/KF5 version
* [kstyle] Port to KWindowSystem shadows API
* [kstyle] Drop Qt 4 style plugin
* Center only during drawing, not the hit rects (kde#416348)
- Drop Qt4 support:
* breeze4-style.spec
* breeze4-style.changes
* add-support-for-Q3ListView-to-the-KDE4-style.patch
-------------------------------------------------------------------
Tue May 5 13:01:51 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>

6
breeze.spec
View File

@ -22,15 +22,15 @@
%{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
%bcond_without lang
Name: breeze
Version: 5.18.5
Version: 5.19.0
Release: 0
Summary: Plasma Desktop artwork, styles and assets
License: GPL-2.0-or-later
Group: System/GUI/KDE
URL: http://www.kde.org
Source: https://download.kde.org/stable/plasma/%{version}/breeze-%{version}.tar.xz
Source: breeze-%{version}.tar.xz
%if %{with lang}
Source1: https://download.kde.org/stable/plasma/%{version}/breeze-%{version}.tar.xz.sig
Source1: breeze-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
BuildRequires: cmake >= 2.8.12

1318
breeze4-style.changes
View File

File diff suppressed because it is too large Load Diff

80
breeze4-style.spec
View File

@ -1,80 +0,0 @@
#
# spec file for package breeze4-style
#
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: breeze4-style
Version: 5.18.5
Release: 0
Summary: Plasma Desktop artwork, styles and assets
License: GPL-2.0-or-later
Group: System/GUI/KDE
URL: http://www.kde.org
Source: https://download.kde.org/stable/plasma/%{version}/breeze-%{version}.tar.xz
%if %{with lang}
Source1: https://download.kde.org/stable/plasma/%{version}/breeze-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
# PATCH-FIX-OPENSUSE add-support-for-Q3ListView-to-the-KDE4-style.patch boo#973728 wbauer@tmo.at -- fixes collapse/expand icon in Q3ListView that still may be used by some KDE4 applications (knode e.g.)
Patch0: add-support-for-Q3ListView-to-the-KDE4-style.patch
BuildRequires: automoc4
BuildRequires: cmake >= 2.8.12
BuildRequires: kde4-filesystem
BuildRequires: libkde4-devel
BuildRequires: libqt4-devel
BuildRequires: libxcb-devel
# This sets the breeze4 style as default in a Plasma environment
Recommends: kdebase4-workspace-libs
Supplements: packageand(breeze5-style:libqt4)
%if 0%{?suse_version} > 1500
ExclusiveArch: do_not_build
%endif
%description
Artwork, styles and assets for the Breeze visual style for the Plasma Desktop.
This package contains kde4 backport of new default Plasma 5 style.
%package -n libbreezecommon4-5
Summary: Library containing support code for the Breeze Qt4 style
Group: System/Libraries
%description -n libbreezecommon4-5
Library containing support code for the Breeze Qt4 style.
%prep
%setup -q -n breeze-%{version}
%autopatch -p1
%build
%cmake_kde4 -d build -- -DUSE_KDE4=ON
%make_jobs
%install
%kde4_makeinstall -C build
%post -p /sbin/ldconfig -n libbreezecommon4-5
%postun -p /sbin/ldconfig -n libbreezecommon4-5
%files
%license COPYING*
%{_kde4_modulesdir}/
%{_kde4_appsdir}/
%files -n libbreezecommon4-5
%license COPYING*
%{_libdir}/libbreezecommon4.so.*
%changelog