From 9979154d2fd757396ef4685dbbb9bad95c3bf7ff Mon Sep 17 00:00:00 2001 From: Sami Merila Date: Wed, 6 Oct 2010 10:02:45 +0300 Subject: QS60Style: Highlighted TreeBranch indicator is incorrect Part of the fix for QTBUG-13553 incorrectly uses commonstyle to draw branch highlight, when it should use QS60Style. As a fix, commonstyle should not be used unless theme palette has been tempered with. Task-number: QTBUG-13699 Reviewed-by: Miikka Heikkinen --- src/gui/styles/qs60style.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 718774e..1e32bd8 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2453,7 +2453,7 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti case PE_PanelItemViewRow: // ### Qt 5: remove #ifndef QT_NO_ITEMVIEWS if (const QStyleOptionViewItemV4 *vopt = qstyleoption_cast(option)) { - if (QS60StylePrivate::equalToThemePalette(vopt->palette.base().texture().cacheKey(), QPalette::Base)) { + if (!QS60StylePrivate::equalToThemePalette(vopt->palette.base().texture().cacheKey(), QPalette::Base)) { //QPalette::Base has been changed, let commonstyle draw the item commonStyleDraws = true; } else { -- cgit v0.12 From 97d436160c87876cdc272b3ce0bb09256d78405c Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Wed, 6 Oct 2010 09:54:15 +0200 Subject: Remove unused/incorrect TFX commands pertaining to layers on Symbian. These commands have been renamed in the Symbian^4 code line, but since they are not currently used by the effects engine, we simply remove them for now to avoid causing build breakages on platforms that use the older version. Reviewed-by: Jani Hautakangas --- src/gui/kernel/qapplication_s60.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 1127c84..296f24f 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -152,18 +152,12 @@ void QS60Data::controlVisibilityChanged(CCoeControl *control, bool visible) if (backingStore.data()) { backingStore.registerWidget(widget); } else { -#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS - S60->wsSession().SendEffectCommand(ETfxCmdRestoreLayer); -#endif backingStore.create(window); backingStore.registerWidget(widget); qt_widget_private(widget)->invalidateBuffer(widget->rect()); widget->repaint(); } } else { -#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS - S60->wsSession().SendEffectCommand(ETfxCmdDeallocateLayer); -#endif backingStore.unregisterWidget(widget); // In order to ensure that any resources used by the window surface // are immediately freed, we flush the WSERV command buffer. -- cgit v0.12 From d1e415f30b080f0aafefb13aa402634e5710b343 Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Wed, 6 Oct 2010 10:14:21 +0200 Subject: Define QVG_SCISSOR_CLIP for QtOpenVG on Symbian. I avoided adding this flag for ages since I wasn't convinced that it was needed on all Symbian OpenVG hardware, but not having it has caused more problems since people report problems when it is not enabled. Simple solution is just to add it. Task-number: QTBUG-11311 Reviewed-by: Jani Hautakangas --- src/openvg/openvg.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvg/openvg.pro b/src/openvg/openvg.pro index eb60331..c05af90 100644 --- a/src/openvg/openvg.pro +++ b/src/openvg/openvg.pro @@ -35,7 +35,7 @@ contains(QT_CONFIG, egl) { } symbian { - DEFINES += QVG_RECREATE_ON_SIZE_CHANGE QVG_BUFFER_SCROLLING + DEFINES += QVG_RECREATE_ON_SIZE_CHANGE QVG_BUFFER_SCROLLING QVG_SCISSOR_CLIP SOURCES += \ qvg_symbian.cpp } -- cgit v0.12