forked from pool/breeze
Accepting request 292686 from KDE:Frameworks5
Update to 5.2.2 OBS-URL: https://build.opensuse.org/request/show/292686 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/breeze?expand=0&rev=12
This commit is contained in:
commit
4e3dd29a0a
@ -1,84 +0,0 @@
|
||||
From a8d2104ab36c91053da1fee3ad31d68c979965a7 Mon Sep 17 00:00:00 2001
|
||||
From: Hugo Pereira Da Costa <hugo.pereira@free.fr>
|
||||
Date: Thu, 26 Feb 2015 00:17:18 +0100
|
||||
Subject: [PATCH 1/4] Added an explicit flag as output from captionRect to tell
|
||||
whether caption must be ellided or not. BUG: 344552
|
||||
|
||||
---
|
||||
kdecoration/breezedecoration.cpp | 18 ++++++++++--------
|
||||
kdecoration/breezedecoration.h | 8 +++++++-
|
||||
2 files changed, 17 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/kdecoration/breezedecoration.cpp b/kdecoration/breezedecoration.cpp
|
||||
index 3b1479a82b19ca8427690ccc7b00b2f36f2289aa..f63306524e1301477904f284037c54ed09bbe276 100644
|
||||
--- a/kdecoration/breezedecoration.cpp
|
||||
+++ b/kdecoration/breezedecoration.cpp
|
||||
@@ -440,10 +440,13 @@ namespace Breeze
|
||||
|
||||
// draw caption
|
||||
painter->setFont(s->font());
|
||||
- const QRect cR = captionRect();
|
||||
- const QString caption = painter->fontMetrics().elidedText(c->caption(), Qt::ElideMiddle, cR.width());
|
||||
+ const auto cR = captionRect();
|
||||
+ const QString caption = cR.second ?
|
||||
+ painter->fontMetrics().elidedText(c->caption(), Qt::ElideMiddle, cR.first.width()):
|
||||
+ c->caption();
|
||||
+
|
||||
painter->setPen(m_colorSettings.font(c->isActive()));
|
||||
- painter->drawText(cR, Qt::AlignVCenter| Qt::AlignLeft | Qt::TextSingleLine, caption);
|
||||
+ painter->drawText(cR.first, Qt::AlignVCenter| Qt::AlignLeft | Qt::TextSingleLine, caption);
|
||||
|
||||
// draw all buttons
|
||||
m_leftButtons->paint(painter, repaintRegion);
|
||||
@@ -470,7 +473,7 @@ namespace Breeze
|
||||
{ return borderTop() - settings()->smallSpacing()*(Metrics::TitleBar_BottomMargin + Metrics::TitleBar_TopMargin ) - 1; }
|
||||
|
||||
//________________________________________________________________
|
||||
- QRect Decoration::captionRect() const
|
||||
+ QPair<QRect,bool> Decoration::captionRect() const
|
||||
{
|
||||
const int leftOffset = m_leftButtons->geometry().x() + m_leftButtons->geometry().width() + Metrics::TitleBar_SideMargin*settings()->smallSpacing();
|
||||
const int rightOffset = size().width() - m_rightButtons->geometry().x() + Metrics::TitleBar_SideMargin*settings()->smallSpacing();
|
||||
@@ -480,9 +483,8 @@ namespace Breeze
|
||||
boundingRect.setTop( yOffset );
|
||||
boundingRect.setHeight( captionHeight() );
|
||||
|
||||
- /* need to increase the bounding rect because it is sometime (font dependent)
|
||||
- too small, resulting in text being elided */
|
||||
- boundingRect.setWidth( boundingRect.width()+4 );
|
||||
+ // store original width to detect when text ellision is needed
|
||||
+ const int boundingRectWidth( boundingRect.width() );
|
||||
|
||||
switch( m_internalSettings->titleAlignment() )
|
||||
{
|
||||
@@ -518,7 +520,7 @@ namespace Breeze
|
||||
boundingRect.setLeft( qMax( boundingRect.left(), leftOffset ) );
|
||||
}
|
||||
|
||||
- return boundingRect;
|
||||
+ return qMakePair( boundingRect, boundingRect.width() < boundingRectWidth );
|
||||
|
||||
}
|
||||
|
||||
diff --git a/kdecoration/breezedecoration.h b/kdecoration/breezedecoration.h
|
||||
index 9eb6c659fb657e66d2c4dc006b22beef7b22a02c..ccdc6a67c65aad4a17e083b3f3360fc3cb57ddbc 100644
|
||||
--- a/kdecoration/breezedecoration.h
|
||||
+++ b/kdecoration/breezedecoration.h
|
||||
@@ -109,7 +109,13 @@ namespace Breeze
|
||||
void updateAnimationState();
|
||||
|
||||
private:
|
||||
- QRect captionRect() const;
|
||||
+
|
||||
+ /**
|
||||
+ return the smallest rect in which caption will be drawn,
|
||||
+ properly positionned inside the title bar. Second return parameter
|
||||
+ is set to true when text ellision is required
|
||||
+ */
|
||||
+ QPair<QRect,bool> captionRect() const;
|
||||
|
||||
void createButtons();
|
||||
void paintTitleBar(QPainter *painter, const QRect &repaintRegion);
|
||||
--
|
||||
2.3.0
|
||||
|
42
0001-Cleanup-code-to-align-with-master.patch
Normal file
42
0001-Cleanup-code-to-align-with-master.patch
Normal file
@ -0,0 +1,42 @@
|
||||
From 6b0d93d316f14cf00e7b7a5f6f13c4d16ee0ce68 Mon Sep 17 00:00:00 2001
|
||||
From: Hugo Pereira Da Costa <hugo.pereira@free.fr>
|
||||
Date: Sun, 22 Mar 2015 19:52:14 +0100
|
||||
Subject: [PATCH 1/5] Cleanup code to align with master Check for
|
||||
drawBordersOnMaximizedWindows when testing edges flags. BUG: 345424
|
||||
|
||||
---
|
||||
kdecoration/breezedecoration.cpp | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/kdecoration/breezedecoration.cpp b/kdecoration/breezedecoration.cpp
|
||||
index 1c042861e1207c812032eb772849c88b503a3792..dc4219c161f7a2467906083cf62039d5a0645303 100644
|
||||
--- a/kdecoration/breezedecoration.cpp
|
||||
+++ b/kdecoration/breezedecoration.cpp
|
||||
@@ -278,9 +278,14 @@ namespace Breeze
|
||||
auto s = settings();
|
||||
const auto c = client().data();
|
||||
const Qt::Edges edges = c->adjacentScreenEdges();
|
||||
- int left = isMaximizedHorizontally() || edges.testFlag(Qt::LeftEdge) ? 0 : borderSize();
|
||||
- int right = isMaximizedHorizontally() || edges.testFlag(Qt::RightEdge) ? 0 : borderSize();
|
||||
|
||||
+ // left, right and bottom borders
|
||||
+ auto testFlag = [&]( Qt::Edge edge ) { return edges.testFlag(edge) && !m_internalSettings->drawBorderOnMaximizedWindows(); };
|
||||
+ const int left = isMaximizedHorizontally() || testFlag(Qt::LeftEdge) ? 0 : borderSize();
|
||||
+ const int right = isMaximizedHorizontally() || testFlag(Qt::RightEdge) ? 0 : borderSize();
|
||||
+ const int bottom = isMaximizedVertically() || c->isShaded() || testFlag(Qt::BottomEdge) ? 0 : borderSize(true);
|
||||
+
|
||||
+ // top border
|
||||
QFontMetrics fm(s->font());
|
||||
int top = qMax(fm.boundingRect(c->caption()).height(), buttonHeight() );
|
||||
|
||||
@@ -292,7 +297,6 @@ namespace Breeze
|
||||
// padding above
|
||||
top += baseSize*TitleBar_TopMargin;
|
||||
|
||||
- int bottom = isMaximizedVertically() || c->isShaded() || edges.testFlag(Qt::BottomEdge) ? 0 : borderSize(true);
|
||||
setBorders(QMargins(left, top, right, bottom));
|
||||
|
||||
// extended sizes
|
||||
--
|
||||
2.3.3
|
||||
|
@ -1,37 +0,0 @@
|
||||
From 759ff9bf1ba38a47214849bc0a80cfbc7333c3a9 Mon Sep 17 00:00:00 2001
|
||||
From: Hugo Pereira Da Costa <hugo.pereira@free.fr>
|
||||
Date: Sun, 1 Mar 2015 18:19:10 +0100
|
||||
Subject: [PATCH 2/4] Check scrollbar policy before forwarding events BUG:
|
||||
343659
|
||||
|
||||
---
|
||||
kstyle/breezestyle.cpp | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
|
||||
index 818eaec5e9a0143aa8bec778c620735aabbeb71c..6caa00b7259b44ac38f8db206df1317d2edafbc9 100644
|
||||
--- a/kstyle/breezestyle.cpp
|
||||
+++ b/kstyle/breezestyle.cpp
|
||||
@@ -1002,8 +1002,9 @@ namespace Breeze
|
||||
QList<QScrollBar*> scrollBars;
|
||||
if( QAbstractScrollArea* scrollArea = qobject_cast<QAbstractScrollArea*>( widget ) )
|
||||
{
|
||||
- scrollBars.append( scrollArea->horizontalScrollBar() );
|
||||
- scrollBars.append( scrollArea->verticalScrollBar() );
|
||||
+
|
||||
+ if( scrollArea->horizontalScrollBarPolicy() != Qt::ScrollBarAlwaysOff ) scrollBars.append( scrollArea->horizontalScrollBar() );
|
||||
+ if( scrollArea->verticalScrollBarPolicy() != Qt::ScrollBarAlwaysOff )scrollBars.append( scrollArea->verticalScrollBar() );
|
||||
|
||||
} else if( widget->inherits( "KTextEditor::View" ) ) {
|
||||
|
||||
@@ -5440,7 +5441,6 @@ namespace Breeze
|
||||
|
||||
const bool hasPopupMenu( toolButtonOption->subControls & SC_ToolButtonMenu );
|
||||
const bool hasInlineIndicator( toolButtonOption->features & QStyleOptionToolButton::HasMenu && !hasPopupMenu );
|
||||
-
|
||||
const QRect buttonRect( subControlRect( CC_ToolButton, option, SC_ToolButton, widget ) );
|
||||
const QRect menuRect( subControlRect( CC_ToolButton, option, SC_ToolButtonMenu, widget ) );
|
||||
|
||||
--
|
||||
2.3.0
|
||||
|
@ -0,0 +1,66 @@
|
||||
From 46b78432e25a124e9b85b007723435700aec047a Mon Sep 17 00:00:00 2001
|
||||
From: Hugo Pereira Da Costa <hugo.pereira@free.fr>
|
||||
Date: Sun, 22 Mar 2015 20:22:18 +0100
|
||||
Subject: [PATCH 2/5] set button's visibility depending on the availability of
|
||||
the corresponding feature CCBUG: 343641
|
||||
|
||||
---
|
||||
kdecoration/breezebutton.cpp | 36 +++++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 35 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/kdecoration/breezebutton.cpp b/kdecoration/breezebutton.cpp
|
||||
index 5ac0cfe420c6de50db30491e90dc0244666add33..1a3c0c2b0f66a2c8582798b82dee97dcc7785b12 100644
|
||||
--- a/kdecoration/breezebutton.cpp
|
||||
+++ b/kdecoration/breezebutton.cpp
|
||||
@@ -63,13 +63,47 @@ namespace Breeze
|
||||
if (auto d = qobject_cast<Decoration*>(decoration))
|
||||
{
|
||||
Button *b = new Button(type, d, parent);
|
||||
- if (type == KDecoration2::DecorationButtonType::Menu)
|
||||
+ switch( type )
|
||||
{
|
||||
+
|
||||
+ case KDecoration2::DecorationButtonType::Close:
|
||||
+ b->setVisible( d->client().data()->isCloseable() );
|
||||
+ QObject::connect(d->client().data(), &KDecoration2::DecoratedClient::closeableChanged, b, &Breeze::Button::setVisible );
|
||||
+ break;
|
||||
+
|
||||
+ case KDecoration2::DecorationButtonType::Maximize:
|
||||
+ b->setVisible( d->client().data()->isMaximizeable() );
|
||||
+ QObject::connect(d->client().data(), &KDecoration2::DecoratedClient::maximizeableChanged, b, &Breeze::Button::setVisible );
|
||||
+ break;
|
||||
+
|
||||
+ case KDecoration2::DecorationButtonType::Minimize:
|
||||
+ b->setVisible( d->client().data()->isMinimizeable() );
|
||||
+ QObject::connect(d->client().data(), &KDecoration2::DecoratedClient::minimizeableChanged, b, &Breeze::Button::setVisible );
|
||||
+ break;
|
||||
+
|
||||
+ case KDecoration2::DecorationButtonType::ContextHelp:
|
||||
+ b->setVisible( d->client().data()->providesContextHelp() );
|
||||
+ QObject::connect(d->client().data(), &KDecoration2::DecoratedClient::providesContextHelpChanged, b, &Breeze::Button::setVisible );
|
||||
+ break;
|
||||
+
|
||||
+ case KDecoration2::DecorationButtonType::Shade:
|
||||
+ b->setVisible( d->client().data()->isShadeable() );
|
||||
+ QObject::connect(d->client().data(), &KDecoration2::DecoratedClient::shadeableChanged, b, &Breeze::Button::setVisible );
|
||||
+ break;
|
||||
+
|
||||
+ case KDecoration2::DecorationButtonType::Menu:
|
||||
QObject::connect(d->client().data(), &KDecoration2::DecoratedClient::iconChanged, b, [b]() { b->update(); });
|
||||
+ break;
|
||||
+
|
||||
+ default: break;
|
||||
+
|
||||
}
|
||||
+
|
||||
return b;
|
||||
}
|
||||
+
|
||||
return nullptr;
|
||||
+
|
||||
}
|
||||
|
||||
//__________________________________________________________________
|
||||
--
|
||||
2.3.3
|
||||
|
@ -0,0 +1,87 @@
|
||||
From 695e4aa231fccbe77a6b0a4e21ff6a84f87a5c44 Mon Sep 17 00:00:00 2001
|
||||
From: Hugo Pereira Da Costa <hugo.pereira@free.fr>
|
||||
Date: Sun, 22 Mar 2015 20:39:47 +0100
|
||||
Subject: [PATCH 3/5] Properly update size grip visibility on maximizedChanged,
|
||||
shadedChanged and resizeableChanged
|
||||
|
||||
---
|
||||
kdecoration/breezedecoration.cpp | 24 +++++++++++++++++-------
|
||||
kdecoration/breezedecoration.h | 1 +
|
||||
2 files changed, 18 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/kdecoration/breezedecoration.cpp b/kdecoration/breezedecoration.cpp
|
||||
index dc4219c161f7a2467906083cf62039d5a0645303..08f6f7b17c4b0b7790d82630b168cedd832b6328 100644
|
||||
--- a/kdecoration/breezedecoration.cpp
|
||||
+++ b/kdecoration/breezedecoration.cpp
|
||||
@@ -165,21 +165,21 @@ namespace Breeze
|
||||
);
|
||||
|
||||
connect(client().data(), &KDecoration2::DecoratedClient::activeChanged, this, &Decoration::updateAnimationState);
|
||||
- connect(client().data(), &KDecoration2::DecoratedClient::paletteChanged, this,
|
||||
+ connect(client().data(), &KDecoration2::DecoratedClient::paletteChanged, this,
|
||||
[this]() {
|
||||
m_colorSettings.update(client().data()->palette());
|
||||
m_useSeparator = (m_colorSettings.palette().color( QPalette::Window ) != m_colorSettings.activeTitleBar() );
|
||||
update();
|
||||
}
|
||||
);
|
||||
- connect(client().data(), &KDecoration2::DecoratedClient::widthChanged, this, &Decoration::updateTitleBar);
|
||||
+ connect(client().data(), &KDecoration2::DecoratedClient::widthChanged, this, &Decoration::updateTitleBar);
|
||||
connect(client().data(), &KDecoration2::DecoratedClient::maximizedChanged, this, &Decoration::updateTitleBar);
|
||||
connect(client().data(), &KDecoration2::DecoratedClient::maximizedChanged, this, &Decoration::setOpaque);
|
||||
|
||||
- connect(client().data(), &KDecoration2::DecoratedClient::widthChanged, this, &Decoration::updateButtonsGeometry);
|
||||
+ connect(client().data(), &KDecoration2::DecoratedClient::widthChanged, this, &Decoration::updateButtonsGeometry);
|
||||
connect(client().data(), &KDecoration2::DecoratedClient::maximizedChanged, this, &Decoration::updateButtonsGeometry);
|
||||
- connect(client().data(), &KDecoration2::DecoratedClient::shadedChanged, this, &Decoration::recalculateBorders);
|
||||
- connect(client().data(), &KDecoration2::DecoratedClient::shadedChanged, this, &Decoration::updateButtonsGeometry);
|
||||
+ connect(client().data(), &KDecoration2::DecoratedClient::shadedChanged, this, &Decoration::recalculateBorders);
|
||||
+ connect(client().data(), &KDecoration2::DecoratedClient::shadedChanged, this, &Decoration::updateButtonsGeometry);
|
||||
|
||||
createButtons();
|
||||
createShadow();
|
||||
@@ -208,6 +208,14 @@ namespace Breeze
|
||||
}
|
||||
|
||||
//________________________________________________________________
|
||||
+ void Decoration::updateSizeGripVisibility()
|
||||
+ {
|
||||
+ auto c = client().data();
|
||||
+ if( m_sizeGrip )
|
||||
+ { m_sizeGrip->setVisible( c->isResizeable() && !isMaximized() && !c->isShaded() ); }
|
||||
+ }
|
||||
+
|
||||
+ //________________________________________________________________
|
||||
int Decoration::borderSize(bool bottom) const
|
||||
{
|
||||
const int baseSize = settings()->smallSpacing();
|
||||
@@ -582,10 +590,12 @@ namespace Breeze
|
||||
KDecoration2::DecoratedClient *c( client().data() );
|
||||
if( !c ) return;
|
||||
|
||||
- if( ( c->isResizeable() && c->windowId() != 0 ) )
|
||||
+ if( c->windowId() != 0 )
|
||||
{
|
||||
m_sizeGrip = new SizeGrip( this );
|
||||
- m_sizeGrip->setVisible( !( isMaximized() || c->isShaded() ) );
|
||||
+ connect( client().data(), &KDecoration2::DecoratedClient::maximizedChanged, this, &Breeze::Decoration::updateSizeGripVisibility );
|
||||
+ connect( client().data(), &KDecoration2::DecoratedClient::shadedChanged, this, &Breeze::Decoration::updateSizeGripVisibility );
|
||||
+ connect( client().data(), &KDecoration2::DecoratedClient::resizeableChanged, this, &Breeze::Decoration::updateSizeGripVisibility );
|
||||
}
|
||||
#endif
|
||||
|
||||
diff --git a/kdecoration/breezedecoration.h b/kdecoration/breezedecoration.h
|
||||
index ac1ab3bdc136fd3e4a1e970e86abd0fb92cb6c56..16ff8ff84636f435c7c59d0a0f4835fb509b9b57 100644
|
||||
--- a/kdecoration/breezedecoration.h
|
||||
+++ b/kdecoration/breezedecoration.h
|
||||
@@ -107,6 +107,7 @@ namespace Breeze
|
||||
void updateButtonsGeometry();
|
||||
void updateTitleBar();
|
||||
void updateAnimationState();
|
||||
+ void updateSizeGripVisibility();
|
||||
|
||||
private:
|
||||
|
||||
--
|
||||
2.3.3
|
||||
|
@ -1,31 +0,0 @@
|
||||
From ac6e765800cf6e78a2cae8692f6c49b75df49bda Mon Sep 17 00:00:00 2001
|
||||
From: Hugo Pereira Da Costa <hugo.pereira@free.fr>
|
||||
Date: Tue, 3 Mar 2015 16:37:55 +0100
|
||||
Subject: [PATCH 3/4] return parent style method when option passed to tabBar
|
||||
rect is invalid, instead of full option rect removed check on invalid tabbar
|
||||
size BUG: 344779
|
||||
|
||||
---
|
||||
kstyle/breezestyle.cpp | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
|
||||
index 6caa00b7259b44ac38f8db206df1317d2edafbc9..e91b5da2a1622e8816a77e5cc509f9f4dd236bb2 100644
|
||||
--- a/kstyle/breezestyle.cpp
|
||||
+++ b/kstyle/breezestyle.cpp
|
||||
@@ -1548,11 +1548,10 @@ namespace Breeze
|
||||
|
||||
// cast option and check
|
||||
const QStyleOptionTabWidgetFrame* tabOption = qstyleoption_cast<const QStyleOptionTabWidgetFrame*>( option );
|
||||
- if( !tabOption ) return option->rect;
|
||||
+ if( !tabOption ) return ParentStyleClass::subElementRect( SE_TabWidgetTabBar, option, widget );
|
||||
|
||||
// do nothing if tabbar is hidden
|
||||
const QSize tabBarSize( tabOption->tabBarSize );
|
||||
- if( tabBarSize.isEmpty() ) return option->rect;
|
||||
|
||||
QRect rect( option->rect );
|
||||
QRect tabBarRect( QPoint(0, 0), tabBarSize );
|
||||
--
|
||||
2.3.0
|
||||
|
29
0004-Fixed-foreground-color-for-pressed-buttons.patch
Normal file
29
0004-Fixed-foreground-color-for-pressed-buttons.patch
Normal file
@ -0,0 +1,29 @@
|
||||
From 8c2940fb798150af56ee36af694a92ceb710ebf1 Mon Sep 17 00:00:00 2001
|
||||
From: Hugo Pereira Da Costa <hugo.pereira@free.fr>
|
||||
Date: Mon, 23 Mar 2015 09:12:58 +0100
|
||||
Subject: [PATCH 4/5] Fixed foreground color for pressed buttons
|
||||
|
||||
---
|
||||
kdecoration/breezebutton.cpp | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/kdecoration/breezebutton.cpp b/kdecoration/breezebutton.cpp
|
||||
index 1a3c0c2b0f66a2c8582798b82dee97dcc7785b12..591824838152532c5868c137d9268163161ac83c 100644
|
||||
--- a/kdecoration/breezebutton.cpp
|
||||
+++ b/kdecoration/breezebutton.cpp
|
||||
@@ -348,7 +348,11 @@ namespace Breeze
|
||||
|
||||
auto d = qobject_cast<Decoration*>( decoration() );
|
||||
if( !d ) return QColor();
|
||||
- if( type() == KDecoration2::DecorationButtonType::Close ) {
|
||||
+ if( isPressed() ) {
|
||||
+
|
||||
+ return d->titleBarColor();
|
||||
+
|
||||
+ } else if( type() == KDecoration2::DecorationButtonType::Close ) {
|
||||
|
||||
return d->titleBarColor();
|
||||
|
||||
--
|
||||
2.3.3
|
||||
|
@ -1,26 +0,0 @@
|
||||
From 72d18b7f5245d265fb0eb974854989aebc357724 Mon Sep 17 00:00:00 2001
|
||||
From: Hugo Pereira Da Costa <hugo.pereira@free.fr>
|
||||
Date: Mon, 9 Mar 2015 20:52:13 +0100
|
||||
Subject: [PATCH 4/4] check widget validity before calling deleteLater BUG:
|
||||
344980
|
||||
|
||||
---
|
||||
kstyle/breezepalettehelper.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/kstyle/breezepalettehelper.cpp b/kstyle/breezepalettehelper.cpp
|
||||
index e134a6557722237858850aa854bb6a485a3bb99d..1fcb3e65225002f5eef193028e656ae499961960 100644
|
||||
--- a/kstyle/breezepalettehelper.cpp
|
||||
+++ b/kstyle/breezepalettehelper.cpp
|
||||
@@ -44,7 +44,7 @@ namespace Breeze
|
||||
|
||||
//_____________________________________________________
|
||||
PaletteHelper::~PaletteHelper()
|
||||
- { _widget->deleteLater(); }
|
||||
+ { if( _widget ) _widget->deleteLater(); }
|
||||
|
||||
|
||||
//_____________________________________________________
|
||||
--
|
||||
2.3.0
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c5471268ca0fb4e9f0f2f27c3d4192c306f4bc259135c9aed027a15c4bd0b761
|
||||
size 28137604
|
3
breeze-5.2.2.tar.xz
Normal file
3
breeze-5.2.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5b480d0fd8f277796e7a67d5ac4e255c4479909e5aa0b283e4e0aa21035e8460
|
||||
size 28140232
|
@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 19 17:42:27 UTC 2015 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Update to 5.2.2:
|
||||
* Bugfix release
|
||||
* For more details please see:
|
||||
https://www.kde.org/announcements/plasma-5.2.2.php
|
||||
- Drop patches merged upstream:
|
||||
0003-return-parent-style-method-when-option-passed-to-tab.patch,
|
||||
0002-Check-scrollbar-policy-before-forwarding-events.patch,
|
||||
0004-check-widget-validity-before-calling-deleteLater.patch and
|
||||
0001-Added-an-explicit-flag-as-output-from-captionRect-to.patch
|
||||
- Added patches from upstream:
|
||||
0001-Cleanup-code-to-align-with-master.patch (kde#345424),
|
||||
0002-set-button-s-visibility-depending-on-the-availabilit.patch
|
||||
(kde#343641),
|
||||
0003-Properly-update-size-grip-visibility-on-maximizedCha.patch
|
||||
and 0004-Fixed-foreground-color-for-pressed-buttons.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 16 11:53:48 UTC 2015 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Add explicit kguiaddons-devel BuildRequires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 10 18:49:07 UTC 2015 - hrvoje.senjan@gmail.com
|
||||
|
||||
|
15
breeze.spec
15
breeze.spec
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: breeze
|
||||
Version: 5.2.1
|
||||
Version: 5.2.2
|
||||
Release: 0
|
||||
BuildRequires: cmake >= 2.8.12
|
||||
BuildRequires: extra-cmake-modules >= 0.0.12
|
||||
@ -26,6 +26,7 @@ BuildRequires: kcompletion-devel
|
||||
BuildRequires: kconfig-devel
|
||||
BuildRequires: kcoreaddons-devel
|
||||
BuildRequires: kf5-filesystem
|
||||
BuildRequires: kguiaddons-devel
|
||||
BuildRequires: ki18n-devel
|
||||
BuildRequires: kservice-devel
|
||||
BuildRequires: kwindowsystem-devel
|
||||
@ -47,10 +48,14 @@ Url: http://www.kde.org
|
||||
#Source: http://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz
|
||||
Source: %{name}-%{version}.tar.xz
|
||||
Source99: %{name}-rpmlintrc
|
||||
Patch0: 0001-Added-an-explicit-flag-as-output-from-captionRect-to.patch
|
||||
Patch1: 0002-Check-scrollbar-policy-before-forwarding-events.patch
|
||||
Patch2: 0003-return-parent-style-method-when-option-passed-to-tab.patch
|
||||
Patch3: 0004-check-widget-validity-before-calling-deleteLater.patch
|
||||
# PATCH-FIX-UPSTREAM 0001-Cleanup-code-to-align-with-master.patch
|
||||
Patch0: 0001-Cleanup-code-to-align-with-master.patch
|
||||
# PATCH-FIX-UPSTREAM 0002-set-button-s-visibility-depending-on-the-availabilit.patch
|
||||
Patch1: 0002-set-button-s-visibility-depending-on-the-availabilit.patch
|
||||
# PATCH-FIX-UPSTREAM 0003-Properly-update-size-grip-visibility-on-maximizedCha.patch
|
||||
Patch2: 0003-Properly-update-size-grip-visibility-on-maximizedCha.patch
|
||||
# PATCH-FIX-UPSTREAM 0004-Fixed-foreground-color-for-pressed-buttons.patch
|
||||
Patch3: 0004-Fixed-foreground-color-for-pressed-buttons.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
|
@ -1,3 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 19 17:42:27 UTC 2015 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Update to 5.2.2:
|
||||
* Bugfix release
|
||||
* For more details please see:
|
||||
https://www.kde.org/announcements/plasma-5.2.2.php
|
||||
- Drop patches merged upstream:
|
||||
0003-return-parent-style-method-when-option-passed-to-tab.patch,
|
||||
0002-Check-scrollbar-policy-before-forwarding-events.patch,
|
||||
0004-check-widget-validity-before-calling-deleteLater.patch and
|
||||
0001-Added-an-explicit-flag-as-output-from-captionRect-to.patch
|
||||
- Added patches from upstream:
|
||||
0001-Cleanup-code-to-align-with-master.patch (kde#345424),
|
||||
0002-set-button-s-visibility-depending-on-the-availabilit.patch
|
||||
(kde#343641),
|
||||
0003-Properly-update-size-grip-visibility-on-maximizedCha.patch
|
||||
and 0004-Fixed-foreground-color-for-pressed-buttons.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 10 18:49:07 UTC 2015 - hrvoje.senjan@gmail.com
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: breeze4-style
|
||||
Version: 5.2.1
|
||||
Version: 5.2.2
|
||||
Release: 0
|
||||
BuildRequires: automoc4
|
||||
BuildRequires: cmake >= 2.8.12
|
||||
@ -31,10 +31,14 @@ Group: System/GUI/KDE
|
||||
Url: http://www.kde.org
|
||||
#Source: http://download.kde.org/stable/plasma/%{version}/breeze-%{version}.tar.xz
|
||||
Source: breeze-%{version}.tar.xz
|
||||
Patch0: 0001-Added-an-explicit-flag-as-output-from-captionRect-to.patch
|
||||
Patch1: 0002-Check-scrollbar-policy-before-forwarding-events.patch
|
||||
Patch2: 0003-return-parent-style-method-when-option-passed-to-tab.patch
|
||||
Patch3: 0004-check-widget-validity-before-calling-deleteLater.patch
|
||||
# PATCH-FIX-UPSTREAM 0001-Cleanup-code-to-align-with-master.patch
|
||||
Patch0: 0001-Cleanup-code-to-align-with-master.patch
|
||||
# PATCH-FIX-UPSTREAM 0002-set-button-s-visibility-depending-on-the-availabilit.patch
|
||||
Patch1: 0002-set-button-s-visibility-depending-on-the-availabilit.patch
|
||||
# PATCH-FIX-UPSTREAM 0003-Properly-update-size-grip-visibility-on-maximizedCha.patch
|
||||
Patch2: 0003-Properly-update-size-grip-visibility-on-maximizedCha.patch
|
||||
# PATCH-FIX-UPSTREAM 0004-Fixed-foreground-color-for-pressed-buttons.patch
|
||||
Patch3: 0004-Fixed-foreground-color-for-pressed-buttons.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
|
Loading…
Reference in New Issue
Block a user