diff --git a/CMakeLists.txt b/CMakeLists.txt index b58616d..d1002b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ project(sierrabreezeenhanced) -set(PROJECT_VERSION "1.1.0") +set(PROJECT_VERSION "1.2.0") set(PROJECT_VERSION_MAJOR 0) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) diff --git a/ChangeLog b/ChangeLog index 07768b4..7e21f87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ + +V1.2.0 +--------- + +* Fixes issue #108 + V1.1.0 --------- diff --git a/breezedecoration.cpp b/breezedecoration.cpp index 168cb38..f7c7dfa 100644 --- a/breezedecoration.cpp +++ b/breezedecoration.cpp @@ -944,24 +944,6 @@ namespace Breeze else painter->setBrush( titleBarColor ); - auto s = settings(); -// // The following conditional creates a color dissonance when opacity is active between the titlebar and the borders. -// // I don't think it's needed anyway since version 1.1.0, but keeping this comment here for the case, this needs to be reverted. -// if( !s->isAlphaChannelSupported() ) -// painter->drawRect(titleRect); -// else if ( !hasBorders() ) { -// painter->setClipRect(titleRect, Qt::IntersectClip); -// // the rect is made a little bit larger to be able to clip away the rounded corners at the bottom and sides -// painter->drawRoundedRect(titleRect.adjusted( -// isLeftEdge() ? -m_internalSettings->cornerRadius():0, -// isTopEdge() ? -m_internalSettings->cornerRadius():0, -// isRightEdge() ? m_internalSettings->cornerRadius():0, -// m_internalSettings->cornerRadius()), -// m_internalSettings->cornerRadius(), m_internalSettings->cornerRadius()); -// } -// else -// painter->drawRoundedRect(titleRect, m_internalSettings->cornerRadius(), m_internalSettings->cornerRadius()); - if( !c->isShaded() && !hideTitleBar() && outlineColor.isValid() ) { // outline @@ -975,6 +957,7 @@ namespace Breeze painter->restore(); + auto s = settings(); if( !hideTitleBar() ) { // draw caption painter->setFont(s->font());