summaryrefslogtreecommitdiffstats
path: root/src/gui/styles
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix Coverity findings from QS60StyleSami Merila2011-09-022-5/+9
| | | | | | | | | | | | | | Fix issues found out by static analysis tool Coverity from QS60Style. Task-number: QT-4843 Reviewed-by: Miikka Heikkinen
| * Remove whitespace from S60 style codes.Miikka Heikkinen2011-09-022-15/+15
| | | | | | | | Reviewed-by: TrustMe
| * Fix center aligned layouts for Symbian.Miikka Heikkinen2011-09-021-9/+11
| | | | | | | | | | | | | | | | | | Default layout bottom margin for Symbian was double that of top margin, causing center aligning to fail noticeably for smaller layouts. Made default margins more sensible. Task-number: QTBUG-14704 Reviewed-by: Sami Merila
| * Improve robustness of QS60Style when creating native theme bitmapsSami Merila2011-08-311-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | Three robustness improvements: a) When doing a compatibility check for a style part, make check always pass if the part is supported by all platform versions. b) Re-attempt icon creation without a mask, if creation with mask fails. c) Paint theme background with white (instead of just giving up) in error cases. Task-number: QTBUG-21119 Reviewed-by: Miikka Heikkinen
* | Ensure that the proxystyle is used over the style's own functionsAndy Shaw2011-09-071-11/+7
|/ | | | | | | | | | | When calling a style function such as pixelMetric() then this should be done via the proxy style and not on the style directly. This is so that the proxy style always has a chance to override the original style's implementation and still preserve the fallback to the base style. Task-number: QTBUG-20849 Merge-request: 2645 Reviewed-by: olivier
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-08-271-2/+5
|\ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Check if bridge plugin vector is still valid. QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: incorrect work with list
| * QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: ↵peterpa2011-08-251-2/+5
| | | | | | | | | | | | | | incorrect work with list Merge-request: 2664 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-08-271-5/+9
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fixed use of deleted object in XmlPatterns EvaluationCache Crash when creating scroll bar skin graphics on S60 (debug only) QS60Style omits drawing theme background in some Symbian SDKs Fix for qml1shaderplugin GPU resource handling on Symbian Make it easier to select words at the start of a line. Doc: Fixing typo In landscape mode QComboboBox popup can not be showed completely Fix left alignment of native RTL pre-edit text.
| * Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-261-5/+9
| |\ | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc src/xmlpatterns/expr/qevaluationcache_p.h
| | * Crash when creating scroll bar skin graphics on S60 (debug only)Sami Merila2011-08-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When fetching bitmap graphics from native without fallback information, do not define fallback-mif file, since native side uses ASSERT_DEBUG to crash the client if file info exists, but bitmap ID is not defined. This started crashing when root theme removed default scrollbar graphics from its content for Belle release. Task-number: QTBUG-15993 Reviewed-by: Miikka Heikkinen
| | * QS60Style omits drawing theme background in some Symbian SDKsSami Merila2011-08-251-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Latest internal RnD releases have upgraded Symbian version to 5.4. As QS60Style was not aware of this, all the textures that didn't define any version information (i.e. available in all versions) were not drawn at all. Task-number: QT-5176 Reviewed-by: Miikka Heikkinen
* | | Fix bug QTBUG-13901, Mac style button rectChris Meyer2011-08-121-1/+1
|/ / | | | | | | | | Make sure that clicks in the corners of buttons with Mac style are treated properly. Added test case.
* | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-131-5/+5
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-07-121-5/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fix compiler warning in qtextdocument.cpp Fix crash when app font is added Use truncate only for subpixel boundingBox x position Use more numerically robust algorithm to compute QBezier::pointAt(). Fix editable combobox style on Mac Revert 344a4dcfe and part of 93bce787 Fix raster subpixel positioning in Lion
| | * | Fix editable combobox style on MacJiang Jiang2011-07-071-5/+5
| | | | | | | | | | | | | | | | Reviewed-by: Jens Bache-Wiig
* | | | QProgressBar: transparent background on Windows Vista (partId: PP_BAR -> ↵miniak2011-07-111-0/+17
|/ / / | | | | | | | | | | | | | | | | | | PP_TRANSPARENTBAR) Merge-request: 2616 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
* | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-091-1/+3
|\ \ \
| * \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-081-1/+3
| |\ \ \ | | |/ / | |/| / | | |/
| | * Regression: Some QMenus are shown completely transparent in SymbianSami Merila2011-07-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for menu transparency (QTBUG-16857) unveiled an issue in the QS60Style when drawing QMenu background. Style skips drawing of the menu background, since placeHolder texture for QPalette::Window is not replaced with real background for menus. Therefore, we need to check if the widget's palette is still untouched when deciding whether or not to draw the menu background. Task-number: QTBUG-20255 Reviewed-by: Tomi Vihria
* | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-053-1/+15
|\ \ \ | |/ /
| * | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-053-1/+15
| |\ \ | | |/
| | * QS60Style: QMessageBox theme background is incorrectSami Merila2011-07-053-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | Use correct native theme graphic for dialog backgrounds. In the past, native menu background graphic was used for dialogs and menus. Task-number: QTBUG-9924 Reviewed-by: Tomi Vihria
* | | Lion Support: Fix QSpinBox lookGabriel de Dietrich2011-07-051-1/+1
| | | | | | | | | | | | | | | | | | Also sets the read-only state in QStyleOptionSpinBox, wich wasn't before. Reviewed-by: Jens Bache-Wiig
* | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-054-6/+638
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-07-044-6/+638
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: doc/src/external-resources.qdoc src/gui/text/qtextlayout.cpp src/opengl/qwindowsurface_gl.cpp
| | * Regression: QS60Style - All standardIcons are drawn as "small icons"Sami Merila2011-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | StandardIcon enum comparison should be done with bitwise operation, not with value. Task-number: QTBUG-20240 Reviewed-by: Tomi Vihria
| | * QS60Style: provide more standard iconsSami Merila2011-07-014-6/+638
| | | | | | | | | | | | | | | | | | | | | | | | Add custom standard icons for Symbian iconography. Additionally, map few existing standard icon enums to new icons. Task-number: QT-5116 Reviewed-by: Miikka Heikkinen
* | | Lion Support: Hand made rendering of selected tab textGabriel de Dietrich2011-07-041-2/+20
|/ / | | | | | | Reviewed-by: Jens Bache-Wiig
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-011-4/+19
|\ \ | |/ | | | | | | Conflicts: src/s60installs/s60installs.pro
| * Fix QWidget::palettePropagation2() autotest on Symbian (part 2)Sami Merila2011-06-291-0/+1
| | | | | | | | | | | | | | Add also include to QS60Style to avoid build failure. Task-number: QT-5011 Reviewed-by: Miikka Heikkinen
| * Fix QWidget::palettePropagation2() autotest on SymbianSami Merila2011-06-291-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autotest fails since calling QApplication::setPalette() clears away QPalette hash (class specific palette information). QS60Style tries to re-set theme-specific hash after updating application palette with real theme background, but does not take into account that application might have defined own custom palette hash data. As a fix, store the previously set palette hash information and restore it after calling QApplication::setPalette(). Additionally, remove the palette change event sending, since QApplication will post that event anyway when palette is updated. Task-number: QT-5011 Reviewed-by: Miikka Heikkinen
* | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-271-18/+18
| | | | | | | | | | | | New files after previous license change round. Reviewed-by: Trust Me
* | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-06-244-6/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (28 commits) Use numeric virtual keyboard for all number entry modes. QTBUG-17776, reporting terminated threads as not running on Symbian Splitview - Auto-translation rules changed Support clipboard function on Symbian Added qmlshadersplugin to Symbian qt.iby-file. Workaround webkit deadlock on macos x Disable antialiasing for tiled image drawing. Ensure visibility of input widget in QML app when doing layout switch Def update for gui, openvg, and opengl. Revert "Def update." Fix trailing whitespace Remove unnecessary resizes during orientation change Revert "Symbian: Fix QFontInfo::pixelSize()" Improving warning messages in QVolatileImage. Proper naming for raster pixmap and paintengine on Symbian. Def update. Handle QVolatileImage-backed pixmaps optimally in drawPixmap(). Resizable graphicsview's background is drawn incorrectly in splitview Add inputcontext reset to orientation switch in Symbian QS60Style: QGroupBox is drawn as white box in upcoming Symbian release ...
| * \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-244-6/+19
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qpixmap_raster_symbian.cpp src/gui/image/qpixmapdatafactory.cpp src/gui/painting/qgraphicssystem.cpp src/gui/styles/qs60style.cpp src/network/bearer/qnetworkconfigmanager_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtOpenGLu.def src/s60installs/bwins/QtOpenVGu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
| | * Proper naming for raster pixmap and paintengine on Symbian.Laszlo Agocs2011-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | As QTBUG-19880 highlighted, the old S60 naming is not suitable for these classes anymore. Task-number: QTBUG-19913 Reviewed-by: Jani Hautakangas
| | * QS60Style: QGroupBox is drawn as white box in upcoming Symbian releaseSami Merila2011-06-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New Symbian root theme defines KAknsIIDQsnFrSetOpt as empty. Drawing the frame through native API produces white box. Since the frame is no longer used on the native side, skip drawing it from style. Task-number: QTBUG-19782 Reviewed-by: Tomi Vihria
| | * Fix SVG icons on softkeys in new Symbian devicesMiikka Heikkinen2011-06-143-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SVG icons automatically resize to the size of the pixmap, so the size of the icon pixmap needs to be what the platform expects. Added custom pixel metrics for CBA icon size that can be utilized for this purpose. Task-number: QT-5115 Reviewed-by: Sami Merila
| | * Fix pixel metrics for Symbian VGA devicesSami Merila2011-05-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pixel metrics for focus frame (PM_FocusFrameVMargin and PM_FocusFrameHMargin) had invalid values for VGA screens. Additionally these same pixel metrics were adjusted for nHD. Now, all but one QTreeView test cases pass for either screensize. Task-number: QT-5056 Reviewed-by: Tomi Vihria
| | * Revert "Fixing Linux compatibility issues for Symbian"Laszlo Agocs2011-05-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the library names to lowercase breaks 5.0-based Linux builds. It will be investigated if it is possible to change the SDKs instead. If not, the patch will have to be extended to use the original names for 5.0 and the lowercased ones otherwise. This reverts commit 5933d4e4fb8b48ebed641e7f6b1d032df253df30.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-05-181-5/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixing Linux compatibility issues for Symbian
| | | * Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-181-5/+1
| | | | | | | | | | | | | | | | Reviewed-by: Laszlo Agocs
| | * | Update licenseheader text in source filesJyri Tahtela2011-05-1363-1064/+1064
| | |/ | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-06-241-0/+50
|\ \ \ | |/ /
| * | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-174-239/+117
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
| * \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-2463-1064/+1064
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * | | | Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-111-0/+50
| | | | |
* | | | | Fix a case of SP_MediaSkipForward returning the wrong pixmap.Andy Shaw2011-06-101-1/+1
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | This fixes QTBUG-18311. Merge-request: 2621 Reviewed-by: Joao
* | | | QS60Style: Checked state is not shown on highlighted itemview itemSami Merila2011-06-031-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An itemview item with checkstate and highlight is drawn incorrectly without checked state. Consolidate check state drawing logic to happen into one place to avoid incorrect check states. Task-number: QTBUG-19668 Reviewed-by: Miikka Heikkinen
* | | | QS60Style: icon is not shown correctly in a menu item in all casesSami Merila2011-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style was using a pixel metric value for the rect, when it has already earlier calculated a correct size rect to use for an itemview item icon. Use the calculated value, as it is correct in all cases (just icon, icon + checkbox, icon + text, icon + checkbox + text). Task-number: QTBUG-19330 Reviewed-by: Miikka Heikkinen
* | | | QS60Style: Remove 3.x specific code from styleSami Merila2011-05-234-196/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove S60 3.x support from QS60Style. Task-number: QTBUG-18615 Reviewed-by: Miikka Heikkinen