Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lightly for openSUSE:Factory checked in at 2021-02-25 18:30:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lightly (Old) and /work/SRC/openSUSE:Factory/.lightly.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lightly" Thu Feb 25 18:30:14 2021 rev:2 rq:875130 version:0.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/lightly/lightly.changes 2021-02-11 12:52:49.869955208 +0100 +++ /work/SRC/openSUSE:Factory/.lightly.new.2378/lightly.changes 2021-02-25 18:30:23.662295722 +0100 @@ -1,0 +2,11 @@ +Thu Feb 25 13:10:06 UTC 2021 - andy great <[email protected]> + +- Update to version 0.4.1. + * Fixed plasmashell crashes + * Fixed non blurred tilebar when window is maximized + * Removed left gap in some tabs bars + * Shadows are no longer visible under translucent widgets, such + as tabs or buttons. + * Tweaked some animations speed + +------------------------------------------------------------------- Old: ---- Lightly-0.4.tar.gz New: ---- Lightly-0.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightly.spec ++++++ --- /var/tmp/diff_new_pack.DIuwCu/_old 2021-02-25 18:30:24.618296343 +0100 +++ /var/tmp/diff_new_pack.DIuwCu/_new 2021-02-25 18:30:24.626296348 +0100 @@ -1,7 +1,7 @@ # # spec file for package lightly # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,15 +15,18 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %define kf5_ver 5.66.0 Name: lightly -Version: 0.4 +Version: 0.4.1 Release: 0 Summary: A modern style for qt applications License: GPL-2.0-or-later URL: https://github.com/Luwx/Lightly Source0: https://github.com/Luwx/Lightly/archive/v%{version}.tar.gz#/Lightly-%{version}.tar.gz BuildRequires: cmake >= 3.0 +BuildRequires: extra-cmake-modules >= %{kf5_ver} +BuildRequires: gcc-c++ BuildRequires: cmake(KDecoration2) BuildRequires: cmake(KF5ConfigWidgets) >= %{kf5_ver} BuildRequires: cmake(KF5CoreAddons) >= %{kf5_ver} @@ -35,18 +38,17 @@ BuildRequires: cmake(Qt5Quick) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5X11Extras) -BuildRequires: extra-cmake-modules >= %{kf5_ver} -BuildRequires: gcc-c++ -Requires: breeze5-icons -Requires: breeze5-cursors Requires: %{name}-decoration Requires: %{name}-style +Requires: breeze5-cursors +Requires: breeze5-icons %description Lightly is a fork of breeze theme style that aims to be visually modern and minimalistic. %package decoration Summary: Lightly kdecoration theme + %description decoration Lightly is a fork of breeze theme style that aims to be visually modern and minimalistic. @@ -55,6 +57,7 @@ %package style Summary: Lightly kstyle theme and color schemes Requires: kconf_update5 + %description style Lightly is a fork of breeze theme style that aims to be visually modern and minimalistic. @@ -62,6 +65,7 @@ %package -n liblightlycommon5-5 Summary: Lightly support code + %description -n liblightlycommon5-5 Lightly is a fork of breeze theme style that aims to be visually modern and minimalistic. ++++++ Lightly-0.4.tar.gz -> Lightly-0.4.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Lightly-0.4/README.md new/Lightly-0.4.1/README.md --- old/Lightly-0.4/README.md 2021-02-07 05:57:51.000000000 +0100 +++ new/Lightly-0.4.1/README.md 2021-02-24 22:18:29.000000000 +0100 @@ -87,7 +87,7 @@ #### Fedora ``` -sudo dnf install cmake extra-cmake-modules "cmake(Qt5Core)" "cmake(Qt5Gui)" "cmake(Qt5DBus)" "cmake(Qt5X11Extras)" "cmake(KF5GuiAddons)" "cmake(KF5WindowSystem)" "cmake(KF5I18n)" "cmake(KDecoration2)" "cmake(KF5CoreAddons)" "cmake(KF5ConfigWidgets)" "cmake(Qt5UiTools)" "cmake(KF5GlobalAccel)" kwin-devel libepoxy-devel "cmake(KF5Init)" "cmake(KF5Crash)" "cmake(KF5KIO)" "cmake(KF5Notifications)" kf5-kpackage-devel +sudo dnf install cmake extra-cmake-modules "cmake(Qt5Core)" "cmake(Qt5Gui)" "cmake(Qt5DBus)" "cmake(Qt5X11Extras)" "cmake(KF5GuiAddons)" "cmake(KF5WindowSystem)" "cmake(KF5I18n)" "cmake(KDecoration2)" "cmake(KF5CoreAddons)" "cmake(KF5ConfigWidgets)" "cmake(Qt5UiTools)" "cmake(KF5GlobalAccel)" "cmake(KF5IconThemes)" kwin-devel libepoxy-devel "cmake(KF5Init)" "cmake(KF5Crash)" "cmake(KF5KIO)" "cmake(KF5Notifications)" kf5-kpackage-devel ``` #### openSUSE @@ -95,16 +95,29 @@ sudo zypper install cmake gcc-c++ extra-cmake-modules libQt5Gui-devel libQt5DBus-devel libqt5-qttools-devel libqt5-qtx11extras-devel libQt5OpenGL-devel libQt5Network-devel libepoxy-devel kconfig-devel kconfigwidgets-devel kcrash-devel kglobalaccel-devel ki18n-devel kio-devel kservice-devel kinit-devel knotifications-devel kwindowsystem-devel kguiaddons-devel kiconthemes-devel kpackage-devel kwin5-devel xcb-util-devel xcb-util-cursor-devel xcb-util-wm-devel xcb-util-keysyms-devel ``` +#### Solus +``` +sudo eopkg install extra-cmake-modules kdecoration-devel qt5-declarative-devel qt5-x11extras-devel qt5-base-devel kcoreaddons-devel kguiaddons-devel kconfigwidgets-devel kwindowsystem-devel ki18n-devel kiconthemes-devel kcmutils-devel libxcb-devel xcb-util-devel qt5-wayland-devel kwayland-devel wayland-devel frameworkintegration-devel +``` + + ### Build and install ``` -git clone https://github.com/Luwx/Lightly.git +git clone --single-branch --depth=1 https://github.com/Luwx/Lightly.git cd Lightly && mkdir build && cd build cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_TESTING=OFF .. make sudo make install ``` +### Uninstall + +In the build folder: +``` +sudo make uninstall +``` + ## Acknowledgments Breeze authors and Kvantum developer Pedram Pourang. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Lightly-0.4/kdecoration/lightlydecoration.cpp new/Lightly-0.4.1/kdecoration/lightlydecoration.cpp --- old/Lightly-0.4/kdecoration/lightlydecoration.cpp 2021-02-07 05:57:51.000000000 +0100 +++ new/Lightly-0.4.1/kdecoration/lightlydecoration.cpp 2021-02-24 22:18:29.000000000 +0100 @@ -282,7 +282,6 @@ connect(c, &KDecoration2::DecoratedClient::activeChanged, this, &Decoration::updateAnimationState); connect(c, &KDecoration2::DecoratedClient::widthChanged, this, &Decoration::updateTitleBar); connect(c, &KDecoration2::DecoratedClient::maximizedChanged, this, &Decoration::updateTitleBar); - connect(c, &KDecoration2::DecoratedClient::maximizedChanged, this, &Decoration::setOpaque); connect(c, &KDecoration2::DecoratedClient::widthChanged, this, &Decoration::updateButtonsGeometry); connect(c, &KDecoration2::DecoratedClient::maximizedChanged, this, &Decoration::updateButtonsGeometry); @@ -611,7 +610,7 @@ painter->drawRoundedRect(copy, m_internalSettings->cornerRadius(), m_internalSettings->cornerRadius()); // top highlight - if( qGray(this->titleBarColor().rgb()) < 130 ) { + if( qGray(this->titleBarColor().rgb()) < 130 && m_internalSettings->drawHighlight() ) { QPixmap pix = QPixmap( copy.width(), copy.height() ); pix.fill( Qt::transparent ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Lightly-0.4/kdecoration/lightlysettingsdata.kcfg new/Lightly-0.4.1/kdecoration/lightlysettingsdata.kcfg --- old/Lightly-0.4/kdecoration/lightlysettingsdata.kcfg 2021-02-07 05:57:51.000000000 +0100 +++ new/Lightly-0.4.1/kdecoration/lightlysettingsdata.kcfg 2021-02-24 22:18:29.000000000 +0100 @@ -107,6 +107,11 @@ <entry name="DrawSizeGrip" type = "Bool"> <default>false</default> </entry> + + <!-- highlight --> + <entry name="DrawHighlight" type = "Bool"> + <default>true</default> + </entry> <!-- animations --> <entry name="AnimationsEnabled" type = "Bool"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Lightly-0.4/kstyle/animations/lightlywidgetstatedata.cpp new/Lightly-0.4.1/kstyle/animations/lightlywidgetstatedata.cpp --- old/Lightly-0.4/kstyle/animations/lightlywidgetstatedata.cpp 2021-02-07 05:57:51.000000000 +0100 +++ new/Lightly-0.4.1/kstyle/animations/lightlywidgetstatedata.cpp 2021-02-24 22:18:29.000000000 +0100 @@ -18,6 +18,7 @@ *************************************************************************/ #include "lightlywidgetstatedata.h" +#include "lightlystyleconfigdata.h" namespace Lightly { @@ -42,7 +43,7 @@ if ( parameters & AnimationOutBack) animation().data()->setEasingCurve( _state ? QEasingCurve::OutBack : QEasingCurve::InQuint ); else animation().data()->setEasingCurve( ( parameters & AnimationForwardOnly ) ? QEasingCurve::OutQuint : _state ? QEasingCurve::OutQuint : QEasingCurve::InQuint ); - if( ( parameters & AnimationLongDuration ) ) animation().data()->setDuration(800); //FIXME find a better way to set the duration + if( ( parameters & AnimationLongDuration ) ) animation().data()->setDuration( StyleConfigData::animationsDuration()*3 ); //FIXME find a better way to set the duration if( !animation().data()->isRunning() ) animation().data()->start(); else if( _state && ( parameters & AnimationForwardOnly ) ) animation().data()->restart(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Lightly-0.4/kstyle/lightly.kcfg new/Lightly-0.4.1/kstyle/lightly.kcfg --- old/Lightly-0.4/kstyle/lightly.kcfg 2021-02-07 05:57:51.000000000 +0100 +++ new/Lightly-0.4.1/kstyle/lightly.kcfg 2021-02-24 22:18:29.000000000 +0100 @@ -24,7 +24,7 @@ <choice name="ShadowLarge"/> <choice name="ShadowVeryLarge"/> </choices> - <default>ShadowMedium</default> + <default>ShadowLarge</default> </entry> <entry name="ShadowColor" type = "Color"> @@ -132,6 +132,10 @@ <default>false</default> </entry> + <entry name="TabBarTabExpandFullWidth" type="Bool"> + <default>true</default> + </entry> + <entry name="TabDrawHighlight" type="Bool"> <default>false</default> </entry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Lightly-0.4/kstyle/lightlyhelper.cpp new/Lightly-0.4.1/kstyle/lightlyhelper.cpp --- old/Lightly-0.4/kstyle/lightlyhelper.cpp 2021-02-07 05:57:51.000000000 +0100 +++ new/Lightly-0.4.1/kstyle/lightlyhelper.cpp 2021-02-24 22:18:29.000000000 +0100 @@ -947,6 +947,7 @@ // draw shadow if( hasFocus ) { + frameRect.adjust(1, 1, -1, -1); // focus in animation if( mode == 2 && opacity > 0 && opacity < 1) { @@ -981,9 +982,10 @@ p.setCompositionMode(QPainter::CompositionMode_SourceOver); p.setPen(Qt::NoPen); renderBoxShadow( &p, frameRect, 0, 1, 6, outline.darker(120) , radius, windowActive ); // comment this out for only the outline animation - renderBoxShadow( &p, frameRect, 0, 1, 4, outline.darker(120) , radius, windowActive ); // comment this out for only the outline animation + renderBoxShadow( &p, frameRect, 0, 1, 4, outline.darker(130) , radius, windowActive ); // comment this out for only the outline animation + renderBoxShadow( &p, frameRect, 0, 1, 4, outline.darker(140) , radius, windowActive ); // comment this out for only the outline animation p.setBrush( alphaColor( outline, 0.6 ) ) ; - QRectF focusFrame = frameRect.adjusted( -1, -1, 1, 1 ); + QRectF focusFrame = frameRect.adjusted( -2, -2, 2, 2 ); p.drawRoundedRect( focusFrame, radius + 1, radius + 1); // outline around lineedit // mask @@ -997,10 +999,11 @@ // focus animation done else { - renderBoxShadow( painter, frameRect, 0, 1, 6, outline.darker(120) , radius, windowActive ); - renderBoxShadow( painter, frameRect, 0, 1, 4, outline.darker(120) , radius, windowActive ); + renderBoxShadow( painter, frameRect, 0, 1, 7, outline.darker(120) , radius, windowActive ); + renderBoxShadow( painter, frameRect, 0, 1, 5, outline.darker(130) , radius, windowActive ); + renderBoxShadow( painter, frameRect, 0, 1, 4, outline.darker(140) , radius, windowActive ); painter->setBrush( alphaColor( outline, 0.6 ) ) ; - QRectF focusFrame = frameRect.adjusted( -1, -1, 1, 1 ); + QRectF focusFrame = frameRect.adjusted( -2, -2, 2, 2 ); painter->drawRoundedRect( focusFrame, radius + 1, radius + 1); } } @@ -1074,7 +1077,7 @@ if( hasFocus ) radius--; // render - painter->drawRoundedRect( hasFocus ? frameRect.adjusted(1, 1, -1, -1) : frameRect, radius, radius ); + painter->drawRoundedRect( frameRect, radius, radius ); } //______________________________________________________________________________ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Lightly-0.4/kstyle/lightlyshadowhelper.cpp new/Lightly-0.4.1/kstyle/lightlyshadowhelper.cpp --- old/Lightly-0.4/kstyle/lightlyshadowhelper.cpp 2021-02-07 05:57:51.000000000 +0100 +++ new/Lightly-0.4.1/kstyle/lightlyshadowhelper.cpp 2021-02-24 22:18:29.000000000 +0100 @@ -324,7 +324,7 @@ boxRect.moveCenter(outerRect.center()); // Mask out inner rect. - /*if( qMax(shadow1.radius, shadow2.radius) > 3 && frameRadius > 3) { + if( qMax(shadow1.radius, shadow2.radius) > 3 && frameRadius > 3) { QPainter painter(&shadowTexture); painter.setRenderHint(QPainter::Antialiasing); @@ -343,17 +343,17 @@ frameRadius); // Draw outline. - painter.setPen(withOpacity(Qt::black, 0.3)); + /*painter.setPen(withOpacity(Qt::black, 0.3)); painter.setBrush(Qt::NoBrush); painter.setCompositionMode(QPainter::CompositionMode_SourceOver); painter.drawRoundedRect( outerRect - margins, frameRadius-1, - frameRadius-1); + frameRadius-1);*/ // We're done. painter.end(); - }*/ + } const QPoint innerRectTopLeft = outerRect.center(); TileSet shadowTiles = TileSet( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Lightly-0.4/kstyle/lightlystyle.cpp new/Lightly-0.4.1/kstyle/lightlystyle.cpp --- old/Lightly-0.4/kstyle/lightlystyle.cpp 2021-02-07 05:57:51.000000000 +0100 +++ new/Lightly-0.4.1/kstyle/lightlystyle.cpp 2021-02-24 22:18:29.000000000 +0100 @@ -1206,7 +1206,7 @@ } // shadow between toolbar and the rest of the window - if( (widget->palette().color( QPalette::Window ).alpha()/255)*100 < _helper->titleBarColor( true ).alphaF()*100.0 ) + /*if( (widget->palette().color( QPalette::Window ).alpha()/255)*100 < _helper->titleBarColor( true ).alphaF()*100.0 ) { if( LightlyPrivate::possibleTranslucentToolBars.size() == 1 ) { @@ -1220,7 +1220,7 @@ } } } - } + }*/ } } @@ -2130,10 +2130,10 @@ rect.setLeft( leftButtonRect.width() + ( documentMode ? 0 : Metrics::Frame_FrameWidth ) ); rect.setRight( rightButtonRect.left() - ( documentMode ? 0 : Metrics::Frame_FrameWidth ) ); - //tabBarRect.setWidth( qMin( tabBarRect.width(), rect.width() - 2 ) ); // fixed width tabs - tabBarRect.setWidth(rect.width() - 2*Metrics::Frame_FrameWidth); // adwaita qt style tab + if( StyleConfigData::tabBarTabExpandFullWidth() ) tabBarRect.setWidth(rect.width() - 2*Metrics::Frame_FrameWidth); // adwaita qt style tab + else tabBarRect.setWidth( qMin( tabBarRect.width(), rect.width() - 2 ) ); // fixed width tabs if( tabBarAlignment == Qt::AlignCenter ) tabBarRect.moveLeft( rect.left() + (rect.width() - tabBarRect.width())/2 ); - else tabBarRect.moveLeft( rect.left() + Metrics::Frame_FrameWidth ); + else tabBarRect.moveLeft( rect.left() + (documentMode ? 0 : Metrics::Frame_FrameWidth) ); tabBarRect = visualRect( option, tabBarRect ); @@ -3515,7 +3515,6 @@ const AnimationMode mode( _animations->inputWidgetEngine().frameAnimationMode( widget ) ); const qreal opacity( _animations->inputWidgetEngine().frameOpacity( widget ) ); - //qDebug() << opacity << mode; // render const auto &background = palette.color( QPalette::Base ); const auto outline( palette.color( QPalette::Highlight ) ); @@ -3608,7 +3607,7 @@ //const auto outline( _helper->frameOutlineColor( palette ) ); //const State& state( option->state ); - const bool mouseOver ( widget->property("HOVER").toBool() ); + //const bool mouseOver ( widget->property("HOVER").toBool() ); // can cause crashes //qDebug() << mouseOver; @@ -3618,7 +3617,7 @@ */ painter->setClipRegion( option->rect ); - _helper->renderGroupBox( painter, option->rect, background, mouseOver ); + _helper->renderGroupBox( painter, option->rect, background, false ); return true; @@ -6307,8 +6306,31 @@ : QIcon::Off); painter->drawPixmap(iconRect.x(), iconRect.y(), tabIcon); } + + QFont font = painter->font(); + if (!(tabOption->state & State_Enabled)) { + if (tabOption->state & State_Selected) { + //painter->setPen(Colors::mix(option->palette.brush(QPalette::Text).color(), option->palette.brush(QPalette::Window).color(), 0.3)); + painter->setPen( option->palette.brush( QPalette::WindowText ).color() ); + //font.setBold(true); + } else { + painter->setPen( _helper->alphaColor(option->palette.brush( QPalette::WindowText ).color(), 0.5 ) ); + } + } else { + if (tabOption->state & State_Selected) { + painter->setPen(option->palette.brush(QPalette::WindowText).color()); + //painter->setPen( KColorUtils::mix( option->palette.brush(QPalette::WindowText).color(), // test more combinations later + //option->palette.brush(QPalette::Highlight).color(), 0.5 ) ); + //font.setWeight( QFont::Medium ); + } else if (tabOption->state & State_Active && tabOption->state & State_MouseOver) { + painter->setPen(option->palette.brush(QPalette::WindowText).color()); + } else { + painter->setPen( _helper->alphaColor(option->palette.brush( QPalette::WindowText).color(), 0.75 ) ); + } + } + painter->setFont(font); - proxy()->drawItemText(painter, tr, alignment, tabOption->palette, tabOption->state & State_Enabled, tabOption->text, QPalette::WindowText); + proxy()->drawItemText(painter, tr, alignment, tabOption->palette, tabOption->state & State_Enabled, tabOption->text, QPalette::NoRole); if (verticalTabs) painter->restore(); } @@ -6397,6 +6419,8 @@ const bool enabled( state & State_Enabled ); const bool selected( state & State_Selected ); const bool mouseOver( enabled && !selected && ( state & State_MouseOver ) ); + + const bool windowActive( widget && widget->isActiveWindow() ); // check if tab is being dragged const bool isDragged( widget && selected && painter->device() != widget ); @@ -6565,15 +6589,15 @@ default: break; } - + const bool unifiedTabAndHeader = _isKonsole && StyleConfigData::unifiedTabBarKonsole(); if( documentMode && unifiedTabAndHeader && _helper->titleBarColor( true ).alphaF() < 1.0) { _helper->renderTransparentArea(painter, backgroundRect); - painter->fillRect( backgroundRect, QBrush( _helper->titleBarColor( true ) ) ); + painter->fillRect( backgroundRect, QBrush( _helper->titleBarColor( windowActive ) ) ); } - bool changethis = true; + // render if( selected ) { @@ -6584,13 +6608,33 @@ //_helper->renderTabBarTab( painter, rect, color, outline, corners ); if( documentMode ) { - // render dark background and shadow - if( !unifiedTabAndHeader ) _helper->renderTabBarTab(painter, backgroundRect, backgroundColor, backgroundCorners); - _helper->renderBoxShadow(painter, shadowRect, 0, 1, shadowSize, QColor(0,0,0, 220), StyleConfigData::cornerRadius(), changethis); - // render actual tab - _helper->renderBoxShadow(painter, rect/*.adjusted(0,0,0,4)*/,0, 1, 4, QColor(0,0,0, 220), StyleConfigData::cornerRadius(), changethis); - _helper->renderTabBarTab(painter, rect, color, corners); + // konsole's tab + if( unifiedTabAndHeader ) { + + // reajust rect + if( isFirst ) rect.adjust(-3, 0, 0, 0); + else if ( isLast ) rect.adjust(0, 0, 3, 0); + if( color.alphaF() < 1 ) rect.adjust(0, side == SideTop ? -3 : 0, 0, side == SideBottom ? 3 : 0); + + //erase alpha + painter->setCompositionMode( QPainter::CompositionMode_DestinationOut ); + _helper->renderTabBarTab(painter, rect, Qt::black, corners); + painter->setCompositionMode( QPainter::CompositionMode_SourceOver ); + + // no shadow for translucent tab + if( !(color.alphaF() < 1) ) _helper->renderBoxShadow(painter, rect/*.adjusted(0,0,0,4)*/,0, 1, 4, QColor(0,0,0, 220), StyleConfigData::cornerRadius(), true); + _helper->renderTabBarTab(painter, rect, color, corners); + } + else { + + // render dark background and shadow + _helper->renderTabBarTab(painter, backgroundRect, backgroundColor, backgroundCorners); + _helper->renderBoxShadow(painter, shadowRect, 0, 1, shadowSize, QColor(0,0,0, 220), StyleConfigData::cornerRadius(), true); + + _helper->renderBoxShadow(painter, rect/*.adjusted(0,0,0,4)*/,0, 1, 4, QColor(0,0,0, 220), StyleConfigData::cornerRadius(), true); + _helper->renderTabBarTab(painter, rect, color, corners); + } // highlight if( StyleConfigData::tabDrawHighlight() ) { @@ -6615,11 +6659,12 @@ } + // non movable tabs else { painter->setRenderHint( QPainter::Antialiasing, true ); painter->setPen(Qt::NoPen); backgroundRect.adjust(5, 6, -5, -6); - _helper->renderBoxShadow(painter, backgroundRect, 0, 1, 6, QColor(0,0,0,100), StyleConfigData::cornerRadius(), changethis); + _helper->renderBoxShadow(painter, backgroundRect, 0, 1, 6, QColor(0,0,0,100), StyleConfigData::cornerRadius(), true); painter->setBrush(color); painter->drawRoundedRect(backgroundRect, StyleConfigData::cornerRadius(), StyleConfigData::cornerRadius()); painter->setBrush( QColor(255, 255, 255, 20) ); @@ -6632,9 +6677,11 @@ if(documentMode) { - // render dark background and shadow - if( !unifiedTabAndHeader ) _helper->renderTabBarTab(painter, backgroundRect, backgroundColor, backgroundCorners); - _helper->renderBoxShadow(painter, shadowRect, 0, 1, shadowSize, QColor(0,0,0, 220), StyleConfigData::cornerRadius(), changethis); + // render dark background and shadow + if( !unifiedTabAndHeader ) { + _helper->renderTabBarTab(painter, backgroundRect, backgroundColor, backgroundCorners); + } + _helper->renderBoxShadow(painter, shadowRect, 0, 1, shadowSize, QColor(0,0,0, 220), StyleConfigData::cornerRadius(), true); } else { if(!mouseOver) return true; Binary files old/Lightly-0.4/logo.png and new/Lightly-0.4.1/logo.png differ
