summaryrefslogtreecommitdiffstats
path: root/src/gui/styles
Commit message (Collapse)AuthorAgeFilesLines
* Fix drawing text in item view:Olivier Goffart2011-05-031-0/+21
| | | | | | Put back code that was removed by mistake in e8019cf8feb402303e6d253f5ca58bebfda42679 Task-number: QTBUG-18998
* Merge earth-team into origin/4.8Olivier Goffart2011-05-038-54/+90
|\ | | | | | | | | Conflicts: configure
| * Merge branch '4.8-upstream'Thierry Bastian2011-04-283-36/+70
| |\
| | * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-212-11/+11
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_ost/qostdevice.h
| | | * 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
| | * | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-183-25/+59
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * 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
| * | | Merge branch 'master-upstream'Thierry Bastian2011-04-196-97/+83
| |\ \ \ | | |/ /
| * | | Fix incorrect rendering of checked menu items on Windows ClassicJonathan Liu2011-04-122-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify rendering of checked menu items when using Windows Classic style to be more native looking. Changes: * Checked menu items with no icon are not drawn sunken * Disabled checked menu items with an icon have a plain background instead of a checkerboard pattern same as when enabled * Check mark is drawn with highlighted text color when selected to match text * Fix check mark offset for disabled unselected checked menu item as the entire check mark was drawn shifted (1, 1) * Fix color of check mark shadow for disabled unselected checked menu item as it was same color as the check mark when it should be a light color Task-number: QTBUG-15098 Merge-request: 2513 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
| * | | Fix progressbar animation on VistaJens Bache-Wiig2011-04-061-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes two issues. - The indeterminate animation was sometimes incorrectly disabled when value was 0 - The progress animation was incorrectly stopped when progress bars were disabled Task-number: QTBUG-10957 Reviewed-by: richard
| * | | QTabWidget/Win: do not add content margin when documentMode enabledJonathan Liu2011-04-051-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTabWidget has 2 pixel bottom and right content margin. This removes the margin to maximize the area available for content and improve consistency with other Qt styles when documentMode is enabled. Task-number: QTBUG-15769 Merge-request: 957 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
| * | | Don't use inactive borders for spinbox on MacJens Bache-Wiig2011-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was probably caused by the fact that the only spinbox visible in the main control panel has an inactive frame border. In XCode 4, however the spin buttons are generally attached to an active lineedit frame, so we change the default for 4.8. Reviewed-by: gabriel
* | | | Fixes warnings about unused variablesOlivier Goffart2011-04-286-57/+0
| |/ / |/| | | | | | | | Reviewed-by: jbache
* | | Merge earth-team into origin/master'Olivier Goffart2011-04-121-10/+2
|\ \ \
| * \ \ Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-111-3/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/qt.iby
| * | | | Remove workaround and fix properlySami Merila2011-04-071-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The workaround for 3.1 can now completely removed, since support for 3.x was dropped. Task-number: QTBUG-4565 Reviewed-by: Miikka Heikkinen
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-074-61/+49
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: src/corelib/thread/qthread_unix.cpp
| * | | | 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-314-58/+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-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
* | | | Compile with QStringBuilder and QByteArrayOlivier Goffart2011-04-011-0/+1
| | | | | | | | | | | | | | | | Reviewed-by: Denis
* | | | Replace CL_MIN/CL_MAX by qMin/qMaxminiak2011-03-311-23/+20
|/ / / | | | | | | | | | | | | Merge-request: 1011 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-242-3/+11
|\ \ \ | |/ / | | / | |/ |/| 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
| * 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
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-224-11/+32
|\ \ | |/
| * 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
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-5/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/positioners/layoutdirection/layoutdirection.qml src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
| * 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
* | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-163-29/+34
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * 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
* | Merge earth-team into masterOlivier Goffart2011-03-151-1/+1
|\ \
| * | Mac Style: Compile FixMartin Petersson2011-03-141-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-13055 Reviewed-by: Markus Goetz
| * | Fix corner of scroll area so it is stylable on Mac.Martin Petersson2011-03-101-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-13055 Reviewed-by: Olivier Goffart
* | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-03-141-2/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: QS60Style: QTreeView::indexRowSizeHint returns incorrect value Fix TextEdit mouseSelectionMode overriding selectByMouse.
generated by cgit v0.12 at 2024-12-28 17:47:55 (GMT)