diff -Nru kde-style-qtcurve-0.62.6/ChangeLog kde-style-qtcurve-0.62.7/ChangeLog --- kde-style-qtcurve-0.62.6/ChangeLog 2009-03-30 14:53:33.000000000 -0400 +++ kde-style-qtcurve-0.62.7/ChangeLog 2009-04-05 16:06:25.000000000 -0400 @@ -1,3 +1,10 @@ +0.62.7 +------ +1. Dont draw hover for disabled listviews. +2. Stop animating progressbars when they reach max value. +3. Fix 'bleeding' of Arora's progressbar. +4. Don't round Arora's location bar popup. + 0.62.6 ------ 1. Increase menubar item height by 1 pixel - seems to align better diff -Nru kde-style-qtcurve-0.62.6/CMakeLists.txt kde-style-qtcurve-0.62.7/CMakeLists.txt --- kde-style-qtcurve-0.62.6/CMakeLists.txt 2009-03-30 14:53:33.000000000 -0400 +++ kde-style-qtcurve-0.62.7/CMakeLists.txt 2009-04-05 16:06:25.000000000 -0400 @@ -8,7 +8,7 @@ set(CPACK_SOURCE_GENERATOR "TBZ2") set(CPACK_PACKAGE_VERSION_MAJOR "0") set(CPACK_PACKAGE_VERSION_MINOR "62") -set(CPACK_PACKAGE_VERSION_PATCH "6") +set(CPACK_PACKAGE_VERSION_PATCH "7") set(CPACK_PACKAGE_CONTACT "Craig Drummond ") set(QTCURVE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}") set(QTCURVE_VERSION_FULL "${QTCURVE_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}") diff -Nru kde-style-qtcurve-0.62.6/debian/changelog kde-style-qtcurve-0.62.7/debian/changelog --- kde-style-qtcurve-0.62.6/debian/changelog 2009-04-06 09:34:26.000000000 -0400 +++ kde-style-qtcurve-0.62.7/debian/changelog 2009-04-06 09:34:27.000000000 -0400 @@ -1,3 +1,9 @@ +kde-style-qtcurve (0.62.7-0ubuntu1) jaunty; urgency=low + + * New upstream bugfix release (LP: #356247) + + -- Jonathan Thomas Mon, 06 Apr 2009 08:49:17 -0400 + kde-style-qtcurve (0.62.6-0ubuntu1) jaunty; urgency=low * New upstream bugfix release (LP: #352538) diff -Nru kde-style-qtcurve-0.62.6/style/qtcurve.cpp kde-style-qtcurve-0.62.7/style/qtcurve.cpp --- kde-style-qtcurve-0.62.6/style/qtcurve.cpp 2009-03-30 14:53:33.000000000 -0400 +++ kde-style-qtcurve-0.62.7/style/qtcurve.cpp 2009-04-05 16:06:25.000000000 -0400 @@ -366,6 +366,7 @@ APP_SKYPE, APP_KONQUEROR, APP_KONTACT, + APP_ARORA, #ifdef QTC_XBAR_SUPPORT APP_QTDESIGNER, #endif @@ -419,6 +420,14 @@ return activeWindow && activeWindow!=widget ? activeWindow : 0L; } +static const QWidget * getToolBar(const QWidget *w, bool checkQ3) +{ + return w + ? qobject_cast(w) || (checkQ3 && w->inherits("Q3ToolBar")) + ? w + : getToolBar(w->parentWidget(), checkQ3) + : 0L; +} // // OK, Etching looks cr*p on plasma widgets, and khtml... @@ -1005,6 +1014,8 @@ theThemedApp=APP_KONTACT; else if("skype"==appName) theThemedApp=APP_SKYPE; + else if("arora"==appName) + theThemedApp=APP_ARORA; #ifdef QTC_XBAR_SUPPORT else if("Designer"==QCoreApplication::applicationName()) theThemedApp=APP_QTDESIGNER; @@ -1305,7 +1316,7 @@ widget->setPalette(pal); } - bool onToolBar(widget && widget->parent() && (qobject_cast(widget->parent()) || widget->parent()->inherits("Q3ToolBar"))); + bool onToolBar(widget && widget->parent() && 0L!=getToolBar(widget->parentWidget(), true)); if (qobject_cast(widget) || widget->inherits("Q3ToolBar") || @@ -1770,7 +1781,8 @@ { itsAnimateStep = itsTimer.elapsed() / (1000 / constProgressBarFps); foreach (QProgressBar *bar, itsProgressBars) - if ((opts.animatedProgress && 0==itsAnimateStep%2) || (0==bar->minimum() && 0==bar->maximum())) + if ((opts.animatedProgress && 0==itsAnimateStep%2 && bar->value()!=bar->minimum() && bar->value()!=bar->maximum()) || + (0==bar->minimum() && 0==bar->maximum())) bar->update(); } @@ -2633,9 +2645,14 @@ if(sv && (opts.sunkenScrollViews || opts.squareScrollViews)) { - if(opts.squareScrollViews) + bool arora(APP_ARORA==theThemedApp && widget && !widget->parentWidget()); + + if(opts.squareScrollViews || arora) { const QColor *use(backgroundColors(option)); + + if(arora) + painter->fillRect(r, palette.brush(QPalette::Base)); painter->setPen(use[QT_STD_BORDER]); drawRect(painter, r); } @@ -2933,6 +2950,40 @@ if(opt.state&State_Enabled && state&State_ReadOnly) opt.state^=State_Enabled; + if(QTC_DO_EFFECT && APP_ARORA==theThemedApp && widget && widget->parentWidget() && 0==strcmp(widget->metaObject()->className(), "LocationBar")) + { + const QToolBar *tb=(const QToolBar *)getToolBar(widget->parentWidget(), false); + + if(tb) + { + QRect r2(r); + + struct TB : public QToolBar + { + void initOpt(QStyleOptionToolBar *opt) { initStyleOption(opt); } + }; + + QStyleOptionToolBar opt; + + ((TB *)tb)->initOpt(&opt); + bool horiz=Qt::NoToolBarArea==opt.toolBarArea || Qt::BottomToolBarArea==opt.toolBarArea || Qt::TopToolBarArea==opt.toolBarArea; + +// if(horiz) // Should be!!! + { + painter->save(); + + // Only need to adjust coords if toolbar has a gradient... + if(APPEARANCE_FLAT!=opts.toolbarAppearance && APPEARANCE_RAISED!=opts.toolbarAppearance) + { + r2.setY(-widget->mapTo((QWidget *)tb, QPoint(r.x(), r.y())).y()); + r2.setHeight(tb->rect().height()); + } + painter->setClipRegion(QRegion(r2).subtract(QRegion(r2.adjusted(2, 2, -2, -2)))); + drawMenuOrToolBarBackground(painter, r2, &opt, false, horiz); + painter->restore(); + } + } + } painter->save(); drawEntryField(painter, r, widget, &opt, ROUNDED_ALL, false, QTC_DO_EFFECT); painter->restore(); @@ -3268,9 +3319,12 @@ isFlat = (button->features & QStyleOptionButton::Flat); } + if(!(opt.state&State_Enabled)) + opt.state&=~State_MouseOver; + isDefault=isDefault || (doEtch && QTC_FULL_FOCUS && MO_GLOW==opts.coloredMouseOver && - state&State_HasFocus && state&State_Enabled); - if(isFlat && !isDown && !(state&State_MouseOver)) + opt.state&State_HasFocus && opt.state&State_Enabled); + if(isFlat && !isDown && !(opt.state&State_MouseOver)) return; painter->save(); @@ -3473,7 +3527,7 @@ { const QStyleOptionViewItemV4 *v4Opt = qstyleoption_cast(option); const QAbstractItemView *view = qobject_cast(widget); - bool hover = (option->state & State_MouseOver) && (!view || + bool hover = state&State_MouseOver && state&State_Enabled && (!view || QAbstractItemView::NoSelection!=view->selectionMode()), hasCustomBackground = v4Opt->backgroundBrush.style() != Qt::NoBrush && !(option->state & State_Selected),