You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
38 lines
1.6 KiB
38 lines
1.6 KiB
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
|
|
|