Drop upstream patched
This commit is contained in:
Dan Vrátil
parent
8a5a397a97
commit
13f47bca6c
@ -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 3/8] 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 3b1479a..f633065 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 9eb6c65..ccdc6a6 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.1
|
||||
|
||||
@ -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 4/8] 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 818eaec..6caa00b 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.1
|
||||
|
||||
@ -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 6/8] 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 6caa00b..e91b5da 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.1
|
||||
|
||||
@ -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 8/8] 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 e134a65..1fcb3e6 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.1
|
||||
|
||||
@ -18,12 +18,6 @@ URL: https://projects.kde.org/projects/kde/workspace/breeze
|
||||
%endif
|
||||
Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{base_name}-%{version}.tar.xz
|
||||
|
||||
## upstream fixes
|
||||
Patch3: 0003-Added-an-explicit-flag-as-output-from-captionRect-to.patch
|
||||
Patch4: 0004-Check-scrollbar-policy-before-forwarding-events.patch
|
||||
Patch6: 0006-return-parent-style-method-when-option-passed-to-tab.patch
|
||||
Patch8: 0008-check-widget-validity-before-calling-deleteLater.patch
|
||||
|
||||
BuildRequires: kf5-rpm-macros
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
|
||||
Loading…
Reference in New Issue
Block a user