From e72c1ea295cb4b15e0618b6c050ad2ab50adbcd4 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 19 Jul 2016 11:38:59 +0100 Subject: [PATCH 1/2] Update version number for 5.7.2 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31a8ec4d..907beb0f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(breeze) -set(PROJECT_VERSION "5.7.1") +set(PROJECT_VERSION "5.7.2") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) From 4fb5a3bf8b1abcfcdabcf8a9c88276a44b8c2a31 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Wed, 20 Jul 2016 16:17:43 +0200 Subject: [PATCH 2/2] Fixed tabwidget size calculation from contents BUG: 364426 --- kstyle/breezestyle.cpp | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp index 4354f210..06d5eeff 100644 --- a/kstyle/breezestyle.cpp +++ b/kstyle/breezestyle.cpp @@ -2817,22 +2817,8 @@ namespace Breeze } //______________________________________________________________ - QSize Style::tabWidgetSizeFromContents( const QStyleOption* option, const QSize& contentsSize, const QWidget* ) const - { - - // cast option and check - const QStyleOptionTabWidgetFrame* tabOption = qstyleoption_cast( option ); - if( !tabOption ) return expandSize( contentsSize, Metrics::Frame_FrameWidth ); - - // tab orientation - const bool verticalTabs( tabOption && isVerticalTab( tabOption->shape ) ); - - // need to reduce the size in the tabbar direction, due to a bug in QTabWidget::minimumSize - return verticalTabs ? - expandSize( contentsSize, Metrics::Frame_FrameWidth, Metrics::Frame_FrameWidth - 1 ): - expandSize( contentsSize, Metrics::Frame_FrameWidth - 1, Metrics::Frame_FrameWidth ); - - } + QSize Style::tabWidgetSizeFromContents( const QStyleOption*, const QSize& contentsSize, const QWidget* ) const + { return expandSize( contentsSize, Metrics::TabWidget_MarginWidth ); } //______________________________________________________________ QSize Style::tabBarTabSizeFromContents( const QStyleOption* option, const QSize& contentsSize, const QWidget* ) const @@ -4472,7 +4458,6 @@ namespace Breeze // call base class method ParentStyleClass::drawControl( CE_ComboBoxLabel, option, painter, widget ); #endif - return true;