summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qs60style.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in Digia's license headersSergio Ahumada2013-01-131-1/+1
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-291-24/+24
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-011-2/+2
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Converting from double to qreal in guimread2011-10-101-4/+4
| | | | | | | | | | | | | | | | | | There were a number of places in QtGui where doubles were used in expressions due to the use of floating point constants in the code. Many of these constants are now constructed as qreal, removing the use of double operations where unneeded. These changes have been limited to constants that have exactly the same value whether double or float, to ensure that precision errors are not introduced. This should not affect any of the desktop platforms where qreal is double. On Symbian, where qreal is float, appropriate autotests have been run. Task-number: QTBUG-4894 Reviewed-by: Sami Merila
* Regression in QS60Style when drawing webview scrollbarsSami Merila2011-09-151-0/+1
| | | | | | | | | | | | | | QWebviews draws scrollbar background with bright green. This is regression caused by QS60Style change SHA 7dfa50a9b97d28813341329a55aa1a4b5a7de527. This SHA changed theme background creation to happen just before drawing. Unfortunately, web widgets have slightly different palette than non-web widgets, so the style didn't catch the incorrect background texture when painting. Thus, the background was drawn with initialized color (green). Task-number: QTBUG-21463 Reviewed-by: Miikka Heikkinen
* QS60Style: Make spinboxes and lineedits slightly tallerSami Merila2011-09-081-6/+12
| | | | | | | | | | Make spinboxes and lineEdits as tall as comboboxes are. This makes these components to look more like native components. Since spinbox frame width was previously zero, changing the value revealed some button positioning issues. Task-number: QT-4175 Reviewed-by: Miikka Heikkinen
* Fix a bad merge of qs60style.cppSami Merila2011-09-051-3/+0
| | | | | | | Merge cf2f72f4f61f3a9e0e7573379c33bb341eeba7be caused QS60Style.cpp to pick up unrelated changes from Qt4.7 branch. Reviewed-by: Miikka Heikkinen
* Fix Coverity findings from QS60StyleSami Merila2011-09-021-3/+7
| | | | | | | 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-021-14/+14
| | | | 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
* 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.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-051-1/+9
|\ \ | |/
| * QS60Style: QMessageBox theme background is incorrectSami Merila2011-07-051-1/+9
| | | | | | | | | | | | | | | | 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
* | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-07-041-1/+349
|\ \ | |/ | | | | | | | | | | 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-011-1/+349
| | | | | | | | | | | | | | | | 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
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-241-3/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix SVG icons on softkeys in new Symbian devicesMiikka Heikkinen2011-06-141-6/+6
| | | | | | | | | | | | | | | | | | | | 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
| * Update licenseheader text in source filesJyri Tahtela2011-05-131-17/+17
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | 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-231-133/+80
| | | | | | | | | | | | | | Remove S60 3.x support from QS60Style. Task-number: QTBUG-18615 Reviewed-by: Miikka Heikkinen
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamSami Merila2011-05-231-17/+17
|\ \
| * | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | Fix Coverity issues found from QS60StyleSami Merila2011-05-231-23/+12
|/ / | | | | | | | | | | | | There are couple uninitialized variables in QS60Style. This also corrects compilation warnings for the class. Reviewed-by: Tomi Vihria
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-211-0/+11
|\ \ | |/ | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_ost/qostdevice.h
| * Build break fix for simulated QS60StyleSami Merila2011-04-201-0/+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
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-14/+30
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| * 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
| * 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
| * Make QS60Style to support new Tab graphics in new Symbian releasesSami Merila2011-04-081-10/+20
| | | | | | | | | | | | | | | | | | | | | | 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
* | Put all the declarations of qt_defaultDpi{,X,Y}() in one placeJiang Jiang2011-04-051-3/+1
| | | | | | | | Reviewed-by: Samuel Rødal
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-011-2/+3
|\ \ | |/
| * 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
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-33/+47
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| * 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-251-5/+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
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-241-3/+10
|\ \ | |/ | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * 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
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-221-3/+9
|\ \ | |/
| * QS60Style: Update placeholder texture to real oneSami Merila2011-03-221-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-161-24/+17
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/symbian-gcce/qmake.conf qmake/generators/metamakefile.cpp qmake/generators/win32/mingw_make.cpp src/corelib/global/global.pri src/corelib/global/qglobal.h src/opengl/qgl.cpp src/opengl/qwindowsurface_gl.cpp src/plugins/platforms/wayland/qwaylandbuffer.h tests/auto/qnetworkreply/tst_qnetworkreply.cpp tools/designer/src/components/formeditor/qdesigner_resource.cpp
generated by cgit v0.12 at 2025-01-17 06:38:49 (GMT)