Hello community,
here is the log from the commit of package qtcurve-kde4 for openSUSE:Factory
checked in at Fri Aug 7 23:40:45 CEST 2009.
--------
--- KDE/qtcurve-kde4/qtcurve-kde4.changes 2009-08-01 10:07:28.000000000 +0200
+++ qtcurve-kde4/qtcurve-kde4.changes 2009-08-07 00:06:14.000000000 +0200
@@ -1,0 +2,25 @@
+Thu Aug 6 23:59:20 CEST 2009 - beineri@opensuse.org
+
+- update to 0.67.4:
+ * Fix plasma crash on logout
+ * Move menu text 2 pixels closer to icon - matches Gtk2 better
+ * Improve the appearance of QWhatsThis shadows
+
+-------------------------------------------------------------------
+Thu Aug 6 22:23:28 CEST 2009 - beineri@opensuse.org
+
+- update to 0.67.3:
+ * Fix crash in system settings when changing colours.
+ * Yet another attempt to better align button text with Gtk2.
+ * Fix plastik style mouse over on scrollbars.
+ * Draw arrows in popupmenus closer to edge - matches Gtk2 better.
+ * Fix border width of Gtk style combobox menus.
+
+-------------------------------------------------------------------
+Wed Aug 5 12:08:00 CEST 2009 - beineri@opensuse.org
+
+- update to 0.67.2:
+ * Fix titlebar gradients when inactive!=active
+ * Fix garbage on window decoration under KDE4.3 when not compositing
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
QtCurve-KDE4-0.67.1.tar.bz2
New:
----
QtCurve-KDE4-0.67.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtcurve-kde4.spec ++++++
--- /var/tmp/diff_new_pack.5HPyY8/_old 2009-08-07 23:38:17.000000000 +0200
+++ /var/tmp/diff_new_pack.5HPyY8/_new 2009-08-07 23:38:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package qtcurve-kde4 (Version 0.67.1)
+# spec file for package qtcurve-kde4 (Version 0.67.4)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,7 +24,7 @@
License: GPL v2 or later
Group: System/GUI/KDE
Summary: QtCurve style for KDE 4
-Version: 0.67.1
+Version: 0.67.4
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: QtCurve-KDE4-%{version}.tar.bz2
++++++ QtCurve-KDE4-0.67.1.tar.bz2 -> QtCurve-KDE4-0.67.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.1/CMakeLists.txt new/QtCurve-KDE4-0.67.4/CMakeLists.txt
--- old/QtCurve-KDE4-0.67.1/CMakeLists.txt 2009-07-24 22:12:22.000000000 +0200
+++ new/QtCurve-KDE4-0.67.4/CMakeLists.txt 2009-08-06 22:53:06.000000000 +0200
@@ -8,7 +8,7 @@
set(CPACK_SOURCE_GENERATOR "TBZ2")
set(CPACK_PACKAGE_VERSION_MAJOR "0")
set(CPACK_PACKAGE_VERSION_MINOR "67")
-set(CPACK_PACKAGE_VERSION_PATCH "1")
+set(CPACK_PACKAGE_VERSION_PATCH "4")
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.1/ChangeLog new/QtCurve-KDE4-0.67.4/ChangeLog
--- old/QtCurve-KDE4-0.67.1/ChangeLog 2009-07-24 22:12:22.000000000 +0200
+++ new/QtCurve-KDE4-0.67.4/ChangeLog 2009-08-06 22:53:06.000000000 +0200
@@ -1,3 +1,23 @@
+0.67.4
+------
+1. Dont create a KComponentData if KGlobal::hasMainComponent() is true. Fixes
+ plasma crash on logout.
+2. Move menu text 2 pixels closer to icon - matches Gtk2 better.
+3. Improve the appearance of QWhatsThis shadows.
+
+0.67.3
+------
+1. Fix crash in system settings when changing colours.
+2. Yet another attempt to better align button text with Gtk2.
+3. Fix plastik style mouse over on scrollbars.
+4. Draw arrows in popupmenus closer to edge - matches Gtk2 better.
+5. Fix border width of Gtk style combobox menus.
+
+0.67.2
+------
+1. Fix titlebar gradients when inactive!=active
+2. Fix garbage on window decoration under KDE4.3 when not compositing
+
0.67.1
------
1. Adjust Agua overlay if widget is not max rounded.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.1/common/common.h new/QtCurve-KDE4-0.67.4/common/common.h
--- old/QtCurve-KDE4-0.67.1/common/common.h 2009-07-24 22:12:22.000000000 +0200
+++ new/QtCurve-KDE4-0.67.4/common/common.h 2009-08-06 22:53:06.000000000 +0200
@@ -839,7 +839,9 @@
unifySpin,
borderTab,
borderInactiveTab,
- doubleGtkComboArrow;
+ doubleGtkComboArrow,
+ menuIcons,
+ forceAlternateLvCols;
ELvLines lvLines;
EGradType bgndGrad,
menuBgndGrad;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.1/common/config_file.c new/QtCurve-KDE4-0.67.4/common/config_file.c
--- old/QtCurve-KDE4-0.67.1/common/config_file.c 2009-07-24 22:12:22.000000000 +0200
+++ new/QtCurve-KDE4-0.67.4/common/config_file.c 2009-08-06 22:53:06.000000000 +0200
@@ -1149,6 +1149,8 @@
QTC_CFG_READ_BOOL(borderInactiveTab)
QTC_CFG_READ_BOOL(thinSbarGroove)
QTC_CFG_READ_BOOL(colorSliderMouseOver)
+ QTC_CFG_READ_BOOL(menuIcons)
+ QTC_CFG_READ_BOOL(forceAlternateLvCols)
#if defined QTC_CONFIG_DIALOG || (defined QT_VERSION && (QT_VERSION >= 0x040000))
QTC_CFG_READ_BOOL(titlebarBorder)
QTC_CFG_READ_INT(titlebarButtons)
@@ -1753,6 +1755,8 @@
opts->borderInactiveTab=false;
opts->thinSbarGroove=true;
opts->colorSliderMouseOver=false;
+ opts->menuIcons=true;
+ opts->forceAlternateLvCols=false;
#if defined QTC_CONFIG_DIALOG || (defined QT_VERSION && (QT_VERSION >= 0x040000))
opts->titlebarBorder=true;
opts->titlebarButtons=QTC_TITLEBAR_BUTTON_ROUND|QTC_TITLEBAR_BUTTON_HOVER_SYMBOL;
@@ -2321,6 +2325,8 @@
CFG_WRITE_ENTRY(borderInactiveTab)
CFG_WRITE_ENTRY(thinSbarGroove)
CFG_WRITE_ENTRY(colorSliderMouseOver)
+ CFG_WRITE_ENTRY(menuIcons)
+ CFG_WRITE_ENTRY(forceAlternateLvCols)
#if defined QTC_CONFIG_DIALOG || (defined QT_VERSION && (QT_VERSION >= 0x040000))
CFG_WRITE_ENTRY(titlebarBorder)
CFG_WRITE_ENTRY_NUM(titlebarButtons)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.1/kwin/qtcurveclient.cpp new/QtCurve-KDE4-0.67.4/kwin/qtcurveclient.cpp
--- old/QtCurve-KDE4-0.67.1/kwin/qtcurveclient.cpp 2009-07-24 22:12:22.000000000 +0200
+++ new/QtCurve-KDE4-0.67.4/kwin/qtcurveclient.cpp 2009-08-06 22:53:06.000000000 +0200
@@ -49,7 +49,7 @@
{
QtCurveClient::QtCurveClient(KDecorationBridge *bridge, KDecorationFactory *factory)
-#if KDE_IS_VERSION(4,1,80)
+#if KDE_IS_VERSION(4,1,80) && !KDE_IS_VERSION(4,2,92)
: KCommonDecorationUnstable(bridge, factory),
#else
: KCommonDecoration(bridge, factory),
@@ -135,10 +135,13 @@
itsTitleFont = isToolWindow() ? Handler()->titleFontTool() : Handler()->titleFont();
KCommonDecoration::init();
+ /*
+ Disabled as it produces errors when not compoisiting
widget()->setAutoFillBackground(false);
widget()->setAttribute(Qt::WA_NoSystemBackground, true);
widget()->setAttribute(Qt::WA_OpaquePaintEvent);
widget()->setAttribute(Qt::WA_PaintOnScreen, false);
+ */
if(Handler()->showResizeGrip() && isResizable())
itsResizeGrip=new ResizeCorner(this, KDecoration::options()->color(KDecoration::ColorTitleBar, isActive()));
}
@@ -504,8 +507,7 @@
return KCommonDecoration::eventFilter(o, e);
}
-#if KDE_IS_VERSION(4,1,80)
-#if !KDE_IS_VERSION(4,2,92)
+#if KDE_IS_VERSION(4,1,80) && !KDE_IS_VERSION(4,2,92)
// Taken form Oxygen! rev873805
QList<QRect> QtCurveClient::shadowQuads(ShadowType type) const
{
@@ -539,7 +541,6 @@
return 0;
}
#endif
-#endif
void QtCurveClient::reset(unsigned long changed)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.1/kwin/qtcurveclient.h new/QtCurve-KDE4-0.67.4/kwin/qtcurveclient.h
--- old/QtCurve-KDE4-0.67.1/kwin/qtcurveclient.h 2009-07-24 22:12:22.000000000 +0200
+++ new/QtCurve-KDE4-0.67.4/kwin/qtcurveclient.h 2009-08-06 22:53:06.000000000 +0200
@@ -38,7 +38,7 @@
class ResizeCorner;
-#if KDE_IS_VERSION(4,1,80)
+#if KDE_IS_VERSION(4,1,80) && !KDE_IS_VERSION(4,2,92)
class QtCurveClient : public KCommonDecorationUnstable
#else
class QtCurveClient : public KCommonDecoration
@@ -70,12 +70,10 @@
void updateCaption();
bool eventFilter(QObject *o, QEvent *e);
-#if KDE_IS_VERSION(4,1,80)
-#if !KDE_IS_VERSION(4,2,92)
+#if KDE_IS_VERSION(4,1,80) && !KDE_IS_VERSION(4,2,92)
virtual QList<QRect> shadowQuads(ShadowType type) const;
virtual double shadowOpacity(ShadowType type) const;
#endif
-#endif
private:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.1/kwin/qtcurvehandler.cpp new/QtCurve-KDE4-0.67.4/kwin/qtcurvehandler.cpp
--- old/QtCurve-KDE4-0.67.1/kwin/qtcurvehandler.cpp 2009-07-24 22:12:22.000000000 +0200
+++ new/QtCurve-KDE4-0.67.4/kwin/qtcurvehandler.cpp 2009-08-06 22:53:06.000000000 +0200
@@ -301,8 +301,7 @@
<< BorderVeryHuge;
}
-#if KDE_IS_VERSION(4,1,80)
-#if !KDE_IS_VERSION(4,2,92)
+#if KDE_IS_VERSION(4,1,80) && !KDE_IS_VERSION(4,2,92)
// Shadows - Taken from Oxygen! rev873805
QList< QList<QImage> > QtCurveHandler::shadowTextures()
{
@@ -515,7 +514,6 @@
return 1.0;
}
#endif
-#endif
// make the handler accessible to other classes...
static QtCurveHandler *handler = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.1/kwin/qtcurvehandler.h new/QtCurve-KDE4-0.67.4/kwin/qtcurvehandler.h
--- old/QtCurve-KDE4-0.67.1/kwin/qtcurvehandler.h 2009-07-24 22:12:22.000000000 +0200
+++ new/QtCurve-KDE4-0.67.4/kwin/qtcurvehandler.h 2009-08-06 22:53:06.000000000 +0200
@@ -59,7 +59,7 @@
};
class QtCurveHandler : public QObject,
-#if KDE_IS_VERSION(4,1,80)
+#if KDE_IS_VERSION(4,1,80) && !KDE_IS_VERSION(4,2,92)
public KDecorationFactoryUnstable
#else
public KDecorationFactory
@@ -92,14 +92,12 @@
QListQtCurveHandler::BorderSize borderSizes() const;
-#if KDE_IS_VERSION(4,1,80)
-#if !KDE_IS_VERSION(4,2,92)
+#if KDE_IS_VERSION(4,1,80) && !KDE_IS_VERSION(4,2,92)
virtual QList< QList<QImage> > shadowTextures();
virtual int shadowTextureList( ShadowType type ) const;
virtual QList<QRect> shadowQuads( ShadowType type, QSize size ) const;
virtual double shadowOpacity( ShadowType type ) const;
#endif
-#endif
private:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.1/style/qtcurve.cpp new/QtCurve-KDE4-0.67.4/style/qtcurve.cpp
--- old/QtCurve-KDE4-0.67.1/style/qtcurve.cpp 2009-07-24 22:12:22.000000000 +0200
+++ new/QtCurve-KDE4-0.67.4/style/qtcurve.cpp 2009-08-06 22:53:06.000000000 +0200
@@ -780,7 +780,6 @@
QtCurveStyle::QtCurveStyle(const QString &name)
: itsSliderCols(0L),
itsDefBtnCols(0L),
- itsMouseOverCols(0L),
itsComboBtnCols(0L),
itsSortedLvColors(0L),
itsSidebarButtonsCols(0L),
@@ -798,6 +797,7 @@
#if !defined QTC_QT_ONLY
if(KGlobal::hasMainComponent())
itsComponentData=KGlobal::mainComponent();
+ else
{
//printf("Creating KComponentData\n");
@@ -843,11 +843,7 @@
// Set defaults for Hover and Focus, these will be changed when KDE4 palette is applied...
shadeColors(QApplication::palette().color(QPalette::Active, QPalette::Highlight), itsFocusCols);
- if(opts.coloredMouseOver)
- {
- itsMouseOverCols=new QColor [TOTAL_SHADES+1];
- shadeColors(QApplication::palette().color(QPalette::Active, QPalette::Highlight), itsMouseOverCols);
- }
+ shadeColors(QApplication::palette().color(QPalette::Active, QPalette::Highlight), itsMouseOverCols);
switch(opts.shadeSliders)
{
@@ -1003,6 +999,7 @@
QtCurveStyle::~QtCurveStyle()
{
+ killTimer(itsProgressBarAnimateTimer);
#if !defined QTC_QT_ONLY && !defined QTC_DISABLE_KDEFILEDIALOG_CALLS
#if !KDE_IS_VERSION(4, 1, 0)
unsetFileDialogs();
@@ -1017,9 +1014,6 @@
delete [] itsActiveMdiColors;
if(itsMdiColors && itsMdiColors!=itsBackgroundCols)
delete [] itsMdiColors;
- if(itsMouseOverCols && itsMouseOverCols!=itsDefBtnCols &&
- itsMouseOverCols!=itsSliderCols)
- delete [] itsMouseOverCols;
if(itsDefBtnCols && itsDefBtnCols!=itsSliderCols && itsDefBtnCols!=itsFocusCols)
delete [] itsDefBtnCols;
if(itsSliderCols && itsSliderCols!=itsHighlightCols)
@@ -1115,8 +1109,7 @@
SHADE_BLEND_SELECTED!=opts.shadeSliders/*) ||*/ // If so, def btn == slider!
/*(IND_TINT==opts.defBtnIndicator) )*/ &&
(newContrast || newButton || newMenu)),
- newMouseOver(itsMouseOverCols &&
- (newContrast || newButton || newMenu)),
+ newMouseOver(newContrast || newButton || newMenu),
newComboBtn(itsComboBtnCols && itsHighlightCols!=itsComboBtnCols && itsSliderCols!=itsComboBtnCols &&
SHADE_BLEND_SELECTED==opts.comboBtn &&
(newContrast || newButton || newMenu)),
@@ -1253,7 +1246,11 @@
// Enable hover effects in all itemviews
if (QAbstractItemView *itemView = qobject_cast(widget))
+ {
itemView->viewport()->setAttribute(Qt::WA_Hover);
+ if(opts.forceAlternateLvCols && !widget->inherits("KFilePlacesView"))
+ itemView->setAlternatingRowColors(true);
+ }
if(APP_KONTACT==theThemedApp && qobject_cast(widget))
((QToolButton *)widget)->setAutoRaise(true);
@@ -1368,6 +1365,17 @@
{
widget->topLevelWidget()->setWindowTitle(widget->parentWidget()->topLevelWidget()->windowTitle());
}
+ else if(widget->inherits("QWhatsThat"))
+ {
+ QPalette pal(widget->palette());
+ QColor shadow(pal.shadow().color());
+
+ shadow.setAlpha(32);
+ pal.setColor(QPalette::Shadow, shadow);
+ widget->setPalette(pal);
+ widget->setMask(QRegion(widget->rect().adjusted(0, 0, -6, -6))+
+ QRegion(widget->rect().adjusted(6, 6, 0, 0)));
+ }
else if(opts.fixParentlessDialogs)
if(APP_KPRINTER==theThemedApp || APP_KDIALOG==theThemedApp || APP_KDIALOGD==theThemedApp)
{
@@ -2214,6 +2222,9 @@
if (!opts.popupBorder && widget && widget->inherits("QComboBoxPrivateContainer"))
return 0;
+ if(opts.gtkComboMenus && widget && widget->inherits("QComboBoxPrivateContainer"))
+ return 1;
+
if (!opts.gtkScrollViews && widget && widget->parentWidget() && ::qobject_cast(widget) && widget->parentWidget()->inherits("KateView"))
return 0;
@@ -2988,7 +2999,7 @@
RADIUS_INTERNAL)));
painter->setRenderHint(QPainter::Antialiasing, false);
}
-
+
drawBorder(painter, r, &opt,
opts.round &&
( (APP_KMIX==theThemedApp && widget && widget->parentWidget() && qobject_cast(widget) &&
@@ -4387,7 +4398,7 @@
{
painter->setPen(use[QT_STD_BORDER]);
drawAaLine(painter, r.x(), r.y()+r.height()-1, r.x()+r.width()-1, r.y()+r.height()-1);
- if(itsMouseOverCols && opts.coloredMouseOver && state&State_MouseOver && state&State_Enabled)
+ if(opts.coloredMouseOver && state&State_MouseOver && state&State_Enabled)
drawHighlight(painter, QRect(r.x(), r.y()+r.height()-2, r.width(), 2), true, true);
if(q3Header ||
@@ -4414,7 +4425,7 @@
drawAaLine(painter, r.x()+5, r.y()+r.height()-1, r.x()+r.width()-6,
r.y()+r.height()-1);
}
- if(itsMouseOverCols && opts.coloredMouseOver && state&State_MouseOver && state&State_Enabled)
+ if(opts.coloredMouseOver && state&State_MouseOver && state&State_Enabled)
drawHighlight(painter, QRect(r.x(), r.y()+r.height()-3, r.width(), 2), true, true);
}
painter->setRenderHint(QPainter::Antialiasing, false);
@@ -4714,7 +4725,7 @@
bool comboMenu(qobject_cast(widget)),
reverse(Qt::RightToLeft==menuItem->direction);
int checkcol(qMax(menuItem->maxIconWidth, 20)),
- stripeWidth(qMax(checkcol, constMenuPixmapWidth));
+ stripeWidth(qMax(checkcol, constMenuPixmapWidth)-2);
painter->save();
@@ -4765,7 +4776,11 @@
false, opts.menuStripeAppearance, WIDGET_OTHER);
if (selected && enabled)
- drawMenuItem(painter, r.adjusted(0, 0, -1, 0), option, false, ROUNDED_ALL,
+ drawMenuItem(painter,
+ comboMenu && opts.gtkComboMenus
+ ? r
+ : r.adjusted(0, 0, -1, 0),
+ option, false, ROUNDED_ALL,
opts.useHighlightForMenu ? itsHighlightCols : itsBackgroundCols);
if(comboMenu)
@@ -4778,7 +4793,7 @@
else
{
// Check
- QRect checkRect(r.left() + 4, r.center().y() - 6, 13, 13);
+ QRect checkRect(r.left() + 3, r.center().y() - 6, QTC_CHECK_SIZE, QTC_CHECK_SIZE);
checkRect = visualRect(menuItem->direction, menuItem->rect, checkRect);
if (checkable)
{
@@ -4794,7 +4809,7 @@
}
else
{
- if (menuItem->icon.isNull())
+ if (menuItem->icon.isNull() || !opts.menuIcons)
{
QStyleOptionButton button;
button.rect = checkRect;
@@ -4829,7 +4844,7 @@
QRect(menuItem->rect.x(), menuItem->rect.y(),
checkcol, menuItem->rect.height())));
- if (!menuItem->icon.isNull())
+ if (opts.menuIcons && !menuItem->icon.isNull())
{
QIcon::Mode mode(dis ? QIcon::Disabled : QIcon::Normal);
@@ -4862,7 +4877,7 @@
menuItem->rect.getRect(&x, &y, &w, &h);
- int xm(windowsItemFrame + checkcol + windowsItemHMargin),
+ int xm(windowsItemFrame + checkcol + windowsItemHMargin -2),
xpos(menuItem->rect.x() + xm);
QRect textRect(xpos, y + windowsItemVMargin, w - xm - windowsRightBorder - tab + 1, h - 2 * windowsItemVMargin),
vTextRect = visualRect(option->direction, menuItem->rect, textRect);
@@ -4899,7 +4914,7 @@
if (QStyleOptionMenuItem::SubMenu==menuItem->menuItemType) // draw sub menu arrow
{
int dim((menuItem->rect.height() - 4) / 2),
- xpos(menuItem->rect.left() + menuItem->rect.width() - 6 - 2 - dim);
+ xpos(menuItem->rect.left() + menuItem->rect.width() - 3 - dim);
PrimitiveElement arrow(Qt::RightToLeft==option->direction ? PE_IndicatorArrowLeft : PE_IndicatorArrowRight);
QRect vSubMenuRect(visualRect(option->direction, menuItem->rect,
QRect(xpos, menuItem->rect.top() + menuItem->rect.height() / 2 - dim / 2, dim, dim)));
@@ -5025,14 +5040,9 @@
r.translate(pixelMetric(PM_ButtonShiftHorizontal, option, widget),
pixelMetric(PM_ButtonShiftVertical, option, widget));
- //this tweak ensures the font is perfectly centered on small sizes
- //but slightly downward to make it more gnomeish if not
-// if (button->fontMetrics.height() > 14)
-// r.translate(0, 1);
-
-// Doesn't always work :-(
-// if(((r.height()-(4+button->fontMetrics.height()))>>1)>0)
-// r.translate(0, 1);
+ // The following is mainly for DejaVu Sans 11...
+ if(button->fontMetrics.height()==19 && r.height()==(23+(opts.thinnerBtns ? 0 : 2)))
+ r.translate(0, 1);
if (button->features&QStyleOptionButton::HasMenu)
{
@@ -6728,7 +6738,7 @@
if(state&QtCStateKWinNoBorder)
drawBevelGradient(titleCols[ORIGINAL_SHADE], painter, r, true, false,
- MODIFY_AGUA(widgetApp(WIDGET_MDI_WINDOW, &opts, option->state&State_Active)),
+ widgetApp(WIDGET_MDI_WINDOW, &opts, option->state&State_Active),
WIDGET_MDI_WINDOW);
else
{
@@ -7542,6 +7552,8 @@
}
newSize.setHeight(h);
+ // Gtk2's icon->text spacing is 2 pixels smaller - so adjust here...
+ newSize.setWidth(newSize.width()-2);
}
break;
case CT_MenuBarItem:
@@ -8572,10 +8584,10 @@
{
case ROUND_SLIGHT:
case ROUND_NONE:
- endSize=WIDGET_SB_SLIDER==w && MO_PLASTIK==opts.coloredMouseOver && option->state&State_MouseOver ? 6 : 4;
+ endSize=WIDGET_SB_SLIDER==w && MO_PLASTIK==opts.coloredMouseOver && option->state&State_MouseOver ? 7 : 4;
break;
case ROUND_FULL:
- endSize=WIDGET_SB_SLIDER==w && MO_PLASTIK==opts.coloredMouseOver && option->state&State_MouseOver ? 6 : 5;
+ endSize=WIDGET_SB_SLIDER==w && MO_PLASTIK==opts.coloredMouseOver && option->state&State_MouseOver ? 7 : 5;
break;
case ROUND_EXTRA:
endSize=7;
@@ -8601,7 +8613,8 @@
QString key;
bool small(circular || (horiz ? r.width() : r.height())<(2*endSize));
QPixmap pix(small ? QSize(r.width(), r.height()) : QSize(horiz ? size : r.width(), horiz ? r.height() : size));
- uint state(option->state&(State_Raised|State_Sunken|State_On|State_Horizontal|State_HasFocus|State_MouseOver));
+ uint state(option->state&(State_Raised|State_Sunken|State_On|State_Horizontal|State_HasFocus|State_MouseOver|
+ (WIDGET_MDI_WINDOW_BUTTON==w || WIDGET_MDI_WINDOW==w || WIDGET_MDI_WINDOW_TITLE==w ? State_Active : State_None)));
key.sprintf("qtc-%x-%d-%x-%x-%x-%x-%x", w, (int)realRound, pix.width(), pix.height(), state, fill.rgba(), (int)(radius*100));
if(!QPixmapCache::find(key, pix))
@@ -8706,7 +8719,7 @@
{
if(WIDGET_SB_SLIDER==w)
{
- int len(QTC_SB_SLIDER_MO_LEN(horiz ? r.width() : r.height())),
+ int len(QTC_SB_SLIDER_MO_LEN(horiz ? r.width() : r.height())+1),
so(lightBorder ? QTC_SLIDER_MO_BORDER : 1),
eo(len+so),
col(QTC_SLIDER_MO_SHADE);
@@ -8813,8 +8826,8 @@
if(plastikMouseOver && !sunken)
{
bool thin(WIDGET_SB_BUTTON==w || WIDGET_SPIN==w || ((horiz ? r.height() : r.width())<16)),
- horizontal(WIDGET_SB_SLIDER==w ? !horiz : (horiz && WIDGET_SB_BUTTON!=w)|| (!horiz && WIDGET_SB_BUTTON==w));
- int len(WIDGET_SB_SLIDER==w ? QTC_SB_SLIDER_MO_LEN(horiz ? r.width() : r.height()) : (thin ? 1 : 2));
+ horizontal(WIDGET_SB_SLIDER==w ? !horiz : (horiz && WIDGET_SB_BUTTON!=w)|| (!horiz && WIDGET_SB_BUTTON==w));
+ int len(WIDGET_SB_SLIDER==w ? QTC_SB_SLIDER_MO_LEN(horiz ? r.width() : r.height())+2 : (thin ? 1 : 2));
p->save();
if(horizontal)
@@ -8882,8 +8895,7 @@
(MO_GLOW==opts.coloredMouseOver/* || MO_COLORED==opts.colorMenubarMouseOver*/) && option->state&State_MouseOver) ||
(doEtch && WIDGET_DEF_BUTTON==w && IND_GLOW==opts.defBtnIndicator)))
drawBorder(p, r, option, round,
- WIDGET_DEF_BUTTON==w && IND_GLOW==opts.defBtnIndicator &&
- (!(option->state&State_MouseOver) || !itsMouseOverCols)
+ WIDGET_DEF_BUTTON==w && IND_GLOW==opts.defBtnIndicator && !(option->state&State_MouseOver)
? itsDefBtnCols : itsMouseOverCols, w);
else
drawBorder(p, r, option, round,
@@ -8895,21 +8907,18 @@
void QtCurveStyle::drawGlow(QPainter *p, const QRect &r, EWidget w) const
{
- if(itsMouseOverCols || itsDefBtnCols)
- {
- bool def(WIDGET_DEF_BUTTON==w && IND_GLOW==opts.defBtnIndicator),
- defShade=def && (!itsDefBtnCols ||
- (itsMouseOverCols && itsDefBtnCols[ORIGINAL_SHADE]==itsMouseOverCols[ORIGINAL_SHADE]));
- QColor col((def && itsDefBtnCols) || !itsMouseOverCols
- ? itsDefBtnCols[QTC_GLOW_DEFBTN] : itsMouseOverCols[QTC_GLOW_MO]);
+ bool def(WIDGET_DEF_BUTTON==w && IND_GLOW==opts.defBtnIndicator),
+ defShade=def && (!itsDefBtnCols ||
+ (itsDefBtnCols[ORIGINAL_SHADE]==itsMouseOverCols[ORIGINAL_SHADE]));
+ QColor col(def && itsDefBtnCols
+ ? itsDefBtnCols[QTC_GLOW_DEFBTN] : itsMouseOverCols[QTC_GLOW_MO]);
- col.setAlphaF(QTC_GLOW_ALPHA(defShade));
- p->setBrush(Qt::NoBrush);
- p->setRenderHint(QPainter::Antialiasing, true);
- p->setPen(col);
- p->drawPath(buildPath(r, w, ROUNDED_ALL, getRadius(&opts, r.width(), r.height(), w, RADIUS_ETCH)));
- p->setRenderHint(QPainter::Antialiasing, false);
- }
+ col.setAlphaF(QTC_GLOW_ALPHA(defShade));
+ p->setBrush(Qt::NoBrush);
+ p->setRenderHint(QPainter::Antialiasing, true);
+ p->setPen(col);
+ p->drawPath(buildPath(r, w, ROUNDED_ALL, getRadius(&opts, r.width(), r.height(), w, RADIUS_ETCH)));
+ p->setRenderHint(QPainter::Antialiasing, false);
}
void QtCurveStyle::drawEtch(QPainter *p, const QRect &r, const QWidget *widget, EWidget w, bool raised) const
@@ -9076,7 +9085,7 @@
hasFocus(enabled && entry && state&State_HasFocus),
hasMouseOver(enabled && WIDGET_ENTRY==w && state&State_MouseOver),
window(WIDGET_MDI_WINDOW==w || WIDGET_MDI_WINDOW_TITLE==w);
- const QColor *cols(enabled && hasMouseOver && itsMouseOverCols && entry
+ const QColor *cols(enabled && hasMouseOver && opts.coloredMouseOver && entry
? itsMouseOverCols
: enabled && hasFocus && itsFocusCols && entry
? itsFocusCols
@@ -9205,9 +9214,9 @@
p->drawPoint(r.x(), r.y()+2);
p->drawPoint(r.x()+r.width()-1, r.y()+2);
p->drawPoint(r.x()+r.width()-3, r.y());
- p->setPen(cols[0]);
- p->drawPoint(r.x()+1, r.y()+2);
- p->drawPoint(r.x()+2, r.y()+1);
+// p->setPen(cols[0]);
+// p->drawPoint(r.x()+1, r.y()+2);
+// p->drawPoint(r.x()+2, r.y()+1);
}
}
}
@@ -10017,7 +10026,7 @@
const QColor * QtCurveStyle::borderColors(const QStyleOption *option, const QColor *use) const
{
- return itsMouseOverCols && opts.coloredMouseOver && option && option->state&State_MouseOver && option->state&State_Enabled
+ return opts.coloredMouseOver && option && option->state&State_MouseOver && option->state&State_Enabled
? itsMouseOverCols : use;
}
@@ -10455,7 +10464,8 @@
{
if(pal)
{
- QApplication::setPalette(standardPalette());
+ if(!kapp)
+ QApplication::setPalette(standardPalette());
setDecorationColors();
}
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-0.67.1/style/qtcurve.h new/QtCurve-KDE4-0.67.4/style/qtcurve.h
--- old/QtCurve-KDE4-0.67.1/style/qtcurve.h 2009-07-24 22:12:22.000000000 +0200
+++ new/QtCurve-KDE4-0.67.4/style/qtcurve.h 2009-08-06 22:53:06.000000000 +0200
@@ -208,9 +208,9 @@
itsBackgroundCols[TOTAL_SHADES+1],
itsMenubarCols[TOTAL_SHADES+1],
itsFocusCols[TOTAL_SHADES+1],
+ itsMouseOverCols[TOTAL_SHADES+1],
*itsSliderCols,
*itsDefBtnCols,
- *itsMouseOverCols,
*itsComboBtnCols,
*itsSortedLvColors,
itsButtonCols[TOTAL_SHADES+1],
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org