summaryrefslogtreecommitdiffstats
path: root/src/gui/styles
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Build break fix for simulated QS60StyleSami Merila2011-04-202-11/+11
| | | | | | | | | | | | | | Recent changes in QS60Style (to support placeholder background texture) causes the simulated style not to build. The implementation for new method placeHolderTexture() is on the Symbian-specific sourcefile, which is omitted in the simulator builds. As a fix, move the implementation to the "generic" style source file qs60style.cpp, since the method does not contain any Symbian specific code. Task-number: QTBUG-18863 Reviewed-by: owolff
* QS60Style: itemview item with checkbox and text is drawn incorrectlySami Merila2011-04-121-2/+2
| | | | | | | | | | | | | QS60Style deduces incorrectly when itemview only contains checkbox. This is minor, yet highly annoying bug that prevents highlighted itemview item from showing its content with themes that have opaque itemview item highlight (highlight covers the text that is underneath). As a fix, check itemview item text and icon content before declaring it as "checkbox only". Task-number: QTBUG-18694 Reviewed-by: Tomi Vihria
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-04-121-2/+4
|\
| * Add focus frame support in style sheetGuoqing Zhang2011-04-121-2/+4
| | | | | | | | | | Task-number: QTBUG-16207 Reviewed-by: Sami Merila
* | Two QListView autotests do not pass on Symbian^3 releasesSami Merila2011-04-121-2/+0
|/ | | | | | | | | | | | | | | | | | tst_QListView::taskQTBUG_2678_spacingAndWrappedText() fails because: QS60Style adds to the itemview item content size margins and empty space, which shouldn't be part of the content size. As a fix, remove these. taskQTBUG_435_deselectOnViewportClick() fails because: Sending a click to a selected itemview item, when it should be sent to below that specific one. It was using hardcoded (center + 20) and autotest assumed that this would be outside of first item. In S60 with touch support, the itemview items are rather tall (49 pixels). As a fix, autotest now uses calculated value, which ensures that click is sent to outside first item. Task-number: QT-4810 Reviewed-by: Tomi Vihria
* Add focus frame support in stylesheetGuoqing Zhang2011-04-081-0/+5
| | | | | Task-number: QTBUG-16027 Reviewed-by: Sami Merila
* Make QS60Style to support new Tab graphics in new Symbian releasesSami Merila2011-04-082-21/+42
| | | | | | | | | | | In SR.11 there is a new theme graphics (with separate ID) for TabWidget tab shapes. Also, shapes are no longer set overlapped, but are side-by-side without any gaps. Earlier releases still use the existing graphics with overlapping. Task-number: QT-4762 Reviewed-by: Miikka Heikkinen
* Labels are not visible in dialogs with all themes (part2)Sami Merila2011-04-071-0/+1
| | | | | | | Added include to the previous fix to prevent compilation issue. Task-number: QT-4559 Reviewed-by: Tomi Vihria
* Labels are not visible in dialogs with all themesSami Merila2011-04-071-0/+7
| | | | | | | | | | | | | QS60Style uses different theme background for dialogs. However, labels use just one color irregardless of background texture. Therefore, in certain themes, this might produce an issue, where foreground color (label) is not visible from background. To fix this, set the label color to correct theme color when label is contained within a dialog. Task-number: QT-4559 Reviewed-by: Tomi Vihria
* QS60Style: Regression in drawing dialog backgroundSami Merila2011-03-311-1/+2
| | | | | | | | | Fix for QTBUG-16858 improved somewhat QComboBox menu drawing, but unfortunately caused regression in QMenu and dialog background drawing. These widgets shouldn't reserve space for PM_MenuVMargin. Task-number: QTBUG-18482 Reviewed-by: Dmitry Trofimov
* QS60Style: Support menu separator (pt.2)Sami Merila2011-03-311-1/+1
| | | | | | | | | Additional fix for this task. Make the separator slightly less wide, since on some themes the menu background border might be transparent near the left and right borders. Task-number: QTBUG-10054 Reviewed-by: Tomi Vihria
* Fix for failing autotest QToolBar/SymbianSami Merila2011-03-291-5/+4
| | | | | | | | | | | | | | | QS60Style was calculating the minimum size of a toolbutton inside a toolbar based on number of visible buttons. Of course, when the non-visible buttons become visible and we are limiting the toolbar width to screen width it fails (since the orginally visible button is already claiming to take whole width of toolbar and now-visible button is taking half the button width). As a fix, calculate minimum size based on number buttons only, irregardless of their visibility. Task-number: QTBUG-17777 Reviewed-by: Miikka Heikkinen
* QS60Style: draw QComboBox menu correctlySami Merila2011-03-251-20/+28
| | | | | | | | | | | | | | | Note that this fix only corrects the issues #2 and #3 highlighted in the report. These are: a) no longer is a "background" line drawn after last item b) combobox background is adjusted bigger so that first and last item The remaining issue will be fixed as a separate commit (for separate JIRA task). Task-number: QTBUG-16858 Reviewed-by: Dmitry Trofimov
* QTabWidget tabs are resized in wrong way when device rotatesSami Merila2011-03-254-30/+2
| | | | | | | | | | | | | | | | This used to work so that, style would check from actual AVKON component (navipane) what its size is. Unfortunately, Qt was later changed so that screen furniture is only created on-demand and thus asking navipane's size started to fail. Which lead to situation that tab size would "grow" after navipane was created and tabbar was re-drawn. As a fix, correct the pixel metrics with correct values for nHD and remove size query from native component. The other pixel metrics for other layouts were correct. Task-number: QTBUG-16984 Reviewed-by: Tomi Vihria
* QS60Style: Support for Menu separatorsSami Merila2011-03-251-3/+13
| | | | | | | | | Previously QS60Style didn't draw, nor reserve space for menu separators. Now,one pixel wide line is drawn across menu rectangle. Line color is picked from active device theme. Task-number: QTBUG-10054 Reviewed-by: Tomi Vihria
* Icon in QMessageBox::question is deformed on SymbianSami Merila2011-03-231-3/+10
| | | | | | | | | MessageBox icons are deformed on Qt/S60, since style creates all icons with 1:1 width:height ratio. Based on S60 documentation messagebox icons are of 4:3 ratio. This is the same ratio between all the S60 releases. Task-number: QTBUG-14953 Reviewed-by: Laszlo Agocs
* Add missing nullify for the s60 style's background pixmap pointer.Laszlo Agocs2011-03-231-0/+1
| | | | | | | Qt apps would crash during orientation change without setting m_background to null after deleting it. Reviewed-by: Sami Merila
* QS60Style: Update placeholder texture to real oneSami Merila2011-03-224-11/+32
| | | | | | | | | | | | | | Once the background texture has been created, update it to all widgets. This corrects most cases where texture is used outside of QS60Style. It is still possible to access the placeholder texture and draw it, if: a) QPalette::Window is accessed before drawing even one widget b) Painting the texture happens without using QS60Style Task-number: QTBUG-14910 Reviewed-by: Laszlo Agocs
* Changed s60 style not to rely on QPixmapData::toNativeType().Laszlo Agocs2011-03-211-5/+6
| | | | | | | | | Forcing VG (and GL) pixmapdata to support toNativeType() with type VolatileImage is unnecessary. It is cleaner to try doing a fromNativeType() with bitmap+mask and fall back if that results in a null pixmapdata. Reviewed-by: Jani Hautakangas
* QS60Style: use placeholder texture when polishing widgets and paletteSami Merila2011-03-153-7/+33
| | | | | | | | | | | | | | | | | Background texture is not created until it is actually painted. This allows skipping the whole background texture creation, if app overwrites the QPalette::Window with its own data (image or color). When widget is drawn and style notices that the widget is still using a placeholder (1*1 red QPixmap) texture, it creates the real texture and uses that for drawing. Note that accessing QPalette::Window will give the placeholder pixmap. Which is then again replaced with the real texture, if it is drawn through the qt_s60_fill_background(). Task-number: QTBUG-14910 Reviewed-by: Laszlo Agocs
* Regression: QS60Style: Theme background is incorrectSami Merila2011-03-151-0/+1
| | | | | | | | | | | | | | | | | Fix for QTBUG-16816 cause theme background to display incorrectly after a layout switch is done. Theme background is shown "tiled" instead of being whole screen size. This is because the setBackgroundTexture() call was removed to "save" QPixmap creation. Unfortunately, it really skips the background texture creation, but does not re-create a new one for the new layout, so portrait background is used again. This leads to tiling the image. Let's just return the call to the setBackgroundTexture() (this will eventually anyway be "optimized" with fix for QTBUG-14910). Task-number: QTBUG-17930 Reviewed-by: Laszlo Agocs
* QS60Style slows down layout switch by updating widgets unnecessarilySami Merila2011-03-143-22/+0
| | | | | | | | | | Remove refreshUi() method frmo QS60Style. It might have been necessary two years ago, when we didn't have proper polishing of QWidgets (when style changed), but it is no longer needed. It just slows down orientation switch. Task-number: QTBUG-17840 Reviewed-by: Tomi Vihria
* QS60Style: QTreeView::indexRowSizeHint returns incorrect valueSami Merila2011-03-141-2/+5
| | | | | | | | | | | | | Fix for http://bugreports.qt.nokia.com/browse/QTBUG-17786. QS60Style tries to work around the hardcoded margin that the QCommonStyle adds to menu items (line 4782 in my QCommonStyle.cpp). Unfortunately regular itemview items are handled in the same code branch in QS60Style, so the class incorrectly reduces the itemview height 8 pixels. The reduction should only happen with menu items. Task-number: QTBUG-17786 Reviewed-by: Laszlo Agocs
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-03-011-1/+1
|\ | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * QStyleSheetStyle: dont crash in PE_WIDGET when widget is nullOlivier Goffart2011-02-141-1/+1
| | | | | | | | | | Reviewed-by: Gabriel Task-number: QTBUG-15910
* | Changed QPixmap VG backend to use CFbsBitmap on Symbian.Laszlo Agocs2011-02-281-5/+21
|/ | | | | | | | | | | | | | Similarly to QS60PixmapData, that is used on raster, QVGPixmapData is also backed by a CFbsBitmap from now on (at least when it makes sense to do so). This allows copy-less bitmap handle duplication in from- and toSymbianCFbsBitmap() in case of certain image formats, reduces local heap usage and improves performance with the s60 style due to a reduced number of pixel data copies. Task-number: QT-2505 Reviewed-by: Jason Barron Reviewed-by: Jani Hautakangas
* Application background is incorrect if app locked to landscape.Sami Merila2011-01-261-4/+4
| | | | | | | | | | | | | | | If application orientation has been locked to landscape and application is started out while device orientation is portrait, QS60Style draws the QPalette::background like device would be in landscape. Style is incorrectly following device orientation, when it should follow application orientation. As a fix, style follows now application orientation. As a bonus, unnecessary fullscreen QPixmap creation is avoided when rotating the device. Task-number: QTBUG-16816 Reviewed-by: Jani Hautakangas
* Merge branch '4.7-review' into 4.7-stagingThierry Bastian2011-01-171-2/+4
|\
| * Build failure fix (related to QT-4079)Sami Merila2011-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | Change d281cea3a445aa244901decceffd7d653ed829c8 caused build failure, due to missing comma (one line missing from commit). Fixed by adding the missing change. Task-number: QT-4079 Reviewed-by: Miikka Heikkinen
| * QWidgets support for VGA screenSami Merila2011-01-101-1/+3
| | | | | | | | | | | | | | Add pixelmetrics data for QS60Style to support VGA screensizes. Task-number: QT-4079 Reviewed-by: Miikka Heikkinen
* | Update copyright year to 2011.Jason McDonald2011-01-1062-62/+62
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-074-80/+1
|\ \ | |/ | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Fix crash when closing QFontDialog::getFont() dialog Fix timer warning when deleting item views Remove support for automatic tactile feedback from QS60Style Remove warning about null cursor handle on S60 while handle is valid
| * Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-232-3/+7
| |\
| * | Remove support for automatic tactile feedback from QS60StyleSami Merila2010-12-164-80/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently QS60Style loads automatically a plugin to support tactile feedback for styled applications. However, there is no control over this, so applications cannot remove the automatic support, if they'd like to use Mobility APIs to control the feedback themselves. In order to avoid this, remove tactile feedback plugin from style. Lets see if we can later put this back with optional enable/disable flag. Task-number: QTBUG-16151 Reviewed-by: Miikka Heikkinen
* | | Fixed bug and performance problem in windowsstyle.Samuel Rødal2011-01-071-2/+2
| |/ |/| | | | | | | | | | | | | QImage::fill(Qt::transparent) pre-4.8 is a bug, also using Format_ARGB32 is very unoptimal compared to Format_ARGB32_Premultiplied. Task-number: QTBUG-16439 Reviewed-by: Eskil Abrahamsen Blomfeldt
* | Fix crash in indeterminate progressbars on windowsJens Bache-Wiig2010-12-222-3/+6
| | | | | | | | | | | | | | | | | | Note that this is a surgical fix for 4.7 only. In 4.8 we will add these checks at the top of the styling functions or in the widgets instead. Task-number:QTBUG-15227 Reviewed-by:gabi
* | Fix timer regression for indeterminate progressbarsJens Bache-Wiig2010-12-221-0/+1
|/ | | | | | | | | | | | Indeterminate progressbars were broken since 4.7.0 due to 0f771c62f5253a969f5a8a81bfd9254b9bd58b8f Since start was never called on QElapsedTimer, the elaped time was undefined and resulted in random repaints and behavior for indeterminate progressbars. Task-number:QTBUG-15227 Reviewed-by:richard
* Fix whitespace in qs60style.cppSami Merila2010-12-101-1/+1
| | | | Reviewed-by: TrustMe
* QDateTimeEdit is not showing correctly when resizes in symbianSami Merila2010-12-101-22/+16
| | | | | | | | | | | | | | | | The problem boils down to using large square area for QDateTime widget (which is more or less a date-aware combobox). Style tries to make the combobox button as wide as it is tall, and as button is as tall as the combobox frame, it steals the whole square widget for itself. To fix this, we now limit the combobox button height to be no more than fourth of the total width of the widget. Thus, in normal, non-resized case, button is, as tall as the frame, but as widget is made larger, button stops to grow after reaching quarter of width of the widget. Task-number: QT-4312 Reviewed-by: Janne Koskinen
* Removed some new warnigs.Alessandro Portale2010-11-291-3/+2
|
* Fix warnings related to unused variables.Thiago Macieira2010-11-262-0/+6
| | | | | | | Just add some Q_UNUSED for parameters or remove the variable we don't need for the others. Reviewed-by: Trust Me
* QS60Style: Null pointer crash when using itemviews in some cases (pt2)Sami Merila2010-11-191-2/+2
| | | | | | | Also remove accidentally added whitespaces. Task-number: QTBUG-15455 Reviewed-by: TrustMe
generated by cgit v0.12 at 2024-11-18 17:20:52 (GMT)