summaryrefslogtreecommitdiffstats
path: root/src/widgets/styles
Commit message (Collapse)AuthorAgeFilesLines
* Don't skip content drawing for QtQuickControls SpinBoxMartin Klapetek2014-01-211-1/+5
| | | | | | | | | | | | | | | | If XPThemeData::noContent is set to true, the SpinBox from QtQuickControls renders with transparent background, which is being workarounded by simply adding white rectangle inside the QQC SpinBox, which in turn breaks other themes. This works in normal widget's QStyle because the spinbox there is drawn with a frameless QLineEdit, which fills the background. Setting XPThemeData::noContent to false for QtQuick items only makes the QQC SpinBox render correctly with Windows Vista style. Change-Id: I3229a2582dd1cad95c77e0961aaef502a8c6159a Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix a possible crash in StyleSheetStyleJens Bache-Wiig2014-01-201-1/+3
| | | | | | | Task-number: QTBUG-35901 Change-Id: I72e82a166d30cf5e4dac2917c633c7cbd355c817 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Correct wordwrapped text handling in QListView icon modeSamuel Gaist2014-01-141-1/+4
| | | | | | | | | | | | | Currently a QListView with wordwrapping activated will wrap the text only to the width of the icon even if the grid size is bigger. With this patch the option rect is now updated to match the grid size if valid and the style uses it to determine the correct size when wrapping [ChangeLog][QtWidgets][QTBUG-4714] Use the grid size for wordwrapping when available in icon mode Task-number: QTBUG-4714 Change-Id: I2cb63809d3ee8bd262f38bc11de91df9ff5cf237 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Mac: remove unified toolbar workarounds.Morten Johan Sørvig2014-01-121-25/+2
| | | | | | | | | | | QMainWindow::unifiedTitleAndToolBarOnMac() will again return true, but the new implementation is much more similar to the cross platform one so these workarounds are not needed. Task-number: QTBUG-34411 Change-Id: Ic95f491af94354776385dc984f1a00c64429a3f0 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Mac: Update unified toolbar drawing code.Morten Johan Sørvig2014-01-121-3/+37
| | | | | | | | | | Fill the toolbar background with transparent pixels to allow the view background to shine through. Draw a separator line using HITheme. Task-number: QTBUG-34411 Change-Id: I57732564a67a5a9d1eb7fd9038382b2b65be50a4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Mac: Update PE_IndicatorToolBarHandle drawing.Morten Johan Sørvig2014-01-111-8/+4
| | | | | | | | | Smaller, rounder, darker toolbar handles. Works especially well in unified toolbar mode. Task-number: QTBUG-34411 Change-Id: I41eafdf0bb1dbbb4ed96d7bd799eb6f53bccbf7d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix some typos in documentation.Jeff Tranter2014-01-021-1/+1
| | | | | | | | Fix some spelling and grammatical errors in comments that show up in Qt documentation. No changes to code. Change-Id: I2e946fda0bd9a2117f8e9b2fb300df9bf0a98a6c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Styles: Fix upRule used instead of downRuleCaroline Chao2013-12-101-1/+1
| | | | | Change-Id: Icd157fa522836fab9128322f98b2916cfff35c61 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-12-052-11/+6
|\ | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/macx-ios-clang/features/default_post.prf tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp Change-Id: Iaba97eed2272bccf54289640b8197d40e22f7bf5
| * QStyle: Fix painting of pixmaps with non-integer devicePixelRatioEike Ziller2013-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | For example QIcon can return pixmaps with non-integer devicePixelRatio, if there is no pixmap that exactly matches the requested size. Task-number: QTBUG-35125 Change-Id: I76bfa2766979a454c24b1abcf9e18930f5671c1e Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Fix style animations to stop when the animation target is hiddenJ-P Nurmi2013-12-041-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | QStyleAnimation automatically stopped for hidden QWidgets, but didn't know anything about QQuickItems and kept animating regardless of their visibility. This change ensures that style animations stop as soon as the animation target no longer accepts the animation update eg. it has become hidden or the window was minimized. Task-number: QTBUG-35319 Change-Id: Ie48191fd918c626c0d9afe2e7d2390c495efb071 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Mac style: Fix pressed tab appearanceGabriel de Dietrich2013-11-251-1/+1
| | | | | | | | | | Change-Id: Ib2bfc5afcb4d1a9fa20f5b1ec90c4c239a97954e Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Mac style: Fix selected tab text color on 10.6Gabriel de Dietrich2013-11-251-3/+4
| | | | | | | | | | | | | | | | This is a regression introduced by 65b39b3cdcdfe175d80ccf9428168ed51be77fd8. Task-number: QTBUG-34540 Change-Id: I1f78337b13c806f6b6794b769cfe99206445ce7a Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Remove QMacStyle titlebar height + 4 adjustment and consequencesShawn Rutledge2013-11-211-1/+0
|/ | | | | | | | | | This was a tweak to fix a bug in 2005 which has probably outlived its usefulness, plus an accumulation of workarounds on top. (started as 48b5266e8ff9b472a16290dd923fe24dd0b6989b in the historical repo) Task-number: QTBUG-34760 Change-Id: I2c01269e43636385ee5c89305c6b90f4a7f2c537 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix QSpinBox size calculation problem with empty stylesheetsCaroline Chao2013-10-301-1/+1
| | | | | | | Task-number: QTBUG-34305 Change-Id: I3e89dc66446e9f5e9e1810be367830b9df98ab0b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Fix QCommonStyle::subControlRect(SC_GroupBoxCheckBox)J-P Nurmi2013-10-291-1/+1
| | | | | | | | | Make sure the groupbox check indicator doesn't get placed in negative coordinates when font height is smaller than the indicator height. Task-number: QTBUG-33610 Change-Id: Ifad0016e9311f1212cccb6d5971343beb68517c4 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Remove sunken state for Android.BogDan Vatra2013-10-251-2/+9
| | | | | | | | | Only QLineEdit always sets the sunken state and on some Android devices (e.g HTC) the line edit is painted as it is pressed. Task-number: QTBUG-29565 Change-Id: I25031ffaadba85cae6b6ff17c0847cb706e23503 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Android: Fix the QSlider handler position.BogDan Vatra2013-10-251-4/+7
| | | | | Change-Id: I300f187a94d6c2b6b385c5a129150344f6b805ea Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Doc: Adding mark-up to boolean default values.Jerome Pasion2013-10-085-9/+9
| | | | | | | | | | | | | | | | | Default values should have mark-up to denote that they are code. This commit changes: -"property is true" to "property is \c true". -"Returns true" to "Returns \c true". -"property is false" to "property is \c false". -"returns true" to "returns \c true". -"returns false" to "returns \c false". src/3rdparty and non-documentation instances were ignored. Task-number: QTBUG-33360 Change-Id: Ie87eaa57af947caa1230602b61c5c46292a4cf4e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix some doc errors.Frederik Gladhorn2013-09-211-2/+2
| | | | | | | Change-Id: Ib874d7e9671d9cee75fe41f4dac5d0de7b09245e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Merge branch 'stable' into devSergio Ahumada2013-09-132-1/+10
|\ | | | | | | | | | | | | | | Conflicts: src/concurrent/qtconcurrentmedian.h src/corelib/itemmodels/qabstractitemmodel.cpp Change-Id: Iac46a90bbb2958cef7670031a4b59c3becd8538a
| * Fix highdpi CE_HeaderLabel pixmaps in fusion styleMorten Johan Sørvig2013-09-131-1/+4
| | | | | | | | | | | | | | | | | | | | Make sure enough pixels is sourced by multiplying the layout rect size with the pixmaps devicePixelRatio. Task-number: QTBUG-31477 Change-Id: I742603c09a65a520587da3eef9479ef7f0c87022 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Windows style: Support underlined mnemonics from Qt Quick ControlsGabriel de Dietrich2013-09-121-0/+6
| | | | | | | | | | | | | | | | We use the usual accessibility + private property combo pattern. Task-number: QTBUG-33030 Change-Id: I7fbb704c949ff2df163536534f6f46d2e226402d Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | [1/2] Optimize text drawing for QStyleOptionViewItem in QCommonStyleKonstantin Ritt2013-09-101-6/+6
| | | | | | | | | | | | | | | | | | Optimize isViewItemCached() a bit by reordering conditions so that conditions that going to change more often in a common case evaluated first. Change-Id: Ibb406f964345e8f2bff7b433bf33e09a99dcbdc4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Fix Android Style plugin.BogDan Vatra2013-09-102-79/+296
| | | | | | | | | | | | | | | | Task-number: QTBUG-29565 Change-Id: Iedb861962e3638bcbdf9d9a72a47bebc63b425b9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
* | Remove qFill from the Windows XP styleGiuseppe D'Angelo2013-09-051-1/+1
| | | | | | | | | | | | | | | | QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: Ia5d4a6604a1ec8998d6cb4f03b4c0669a3d6b23f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Remove qSort from QtWidgetsGiuseppe D'Angelo2013-09-052-2/+5
| | | | | | | | | | | | | | | | | | QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: Iec5c10fc4c3b4e684b51f6223bf3cb56acc42b58 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
* | Fix QSpinBox size calculation problem with stylesheetsCaroline Chao2013-09-041-12/+18
| | | | | | | | | | | | | | | | | | Problem caused by change a317ee0a6fa76d1166f6da8593d39eaf7afce83c Task-number: QTBUG-31602 Change-Id: Ie8948445a58f51946f21d567ba91f9f10b848f8b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Sergio Ahumada2013-09-022-23/+24
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-272-23/+24
| |\| | | | | | | | | | | | | | | | | | | Conflicts: examples/widgets/doc/src/addressbook-fr.qdoc Change-Id: Id1196e8e0c6445f1616c3f29234c974d809f8e48
| | * Style: Remove useless background paint for menu scrollerGabriel de Dietrich2013-08-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This would also cause an extra paint in QQuickStyleItem, resulting in the frame being erased for those styles not having a frame width set (e.g., fusion and GTK). Change-Id: I7a9371c540cd31fd9f1400a51c4ec57582996dd2 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * Fix scrollbar appearance on Win8J-P Nurmi2013-08-221-22/+24
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-26503 Change-Id: Id74821e005483d05450467fcaea672bbf35113bc Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | | QStyleSheetStyle: Fix (!a != b)Tobias Hunger2013-09-021-1/+1
|/ / | | | | | | | | | | | | The '!' binds to a, so the comparison is not what is expected. Change-Id: I9192d16e901a9ba6dd13625be544cce6b2fd78c6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Extend QStyle API with a SH_Splitter_OpaqueResize styleHintRohan Garg2013-08-203-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Currently the default for QSplitter::opaqueResize is hard coded, which is less than ideal. Instead this should be provided as a style hint via QStyle so as to give a more uniform look to all applications. Change-Id: I5711811f7b672e36aafcd292ed320308570a0390 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-141-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/macx-xcode/Info.plist.app mkspecs/macx-xcode/Info.plist.lib qmake/doc/qmake.qdocconf src/corelib/global/qglobal.h tests/auto/other/exceptionsafety/exceptionsafety.pro tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a
| * Mac Style: Fix 1-pixel text offset in combo boxGabriel de Dietrich2013-08-071-0/+2
| | | | | | | | | | Change-Id: Ie1bb2b300d6897659f4652c22884f1bd611cd3c4 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Added SH_Widget_Animate in QStyleÀlex Fiestas2013-08-023-0/+16
| | | | | | | | | | | | | | | | | | | | | | Added SH_Widget_Animate in QStyle styleHint, and use it to determine whether widgets should be animated or not. In this patch QTabBar, QColumnView,QTreeView and QWidgetAnimator are patched to obey the new Hint. Change-Id: Iefdbddc52c7843f6653dbfb5462125942489b4d9 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-152-6/+21
|\| | | | | | | Change-Id: I0218a1f08b89f2d56757ab35eec06799d2a1492f
| * Display sizegrip on QMdiSubWindows, even on 10.7 and laterGabriel de Dietrich2013-07-121-4/+18
| | | | | | | | | | | | | | | | | | We don't have 4-edge window resizing, so we need QSizeGrip to be functional again in this case. Task-number: QTBUG-32228 Change-Id: Ib66bc662f8bf0b521427755570bc1cd65fb28446 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Check if widget inherits from QTextEdit when drawing the frameAndy Shaw2013-07-111-2/+3
| | | | | | | | | | | | | | | | | | There can be cases where the accessibility plugin is not available so rather than have an incorrect style in those cases we check if the widget inherits QTextEdit. Change-Id: Ia514ce61f24ef016f56c6dce103f90f699b4048a Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-07-111-0/+4
|\| | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/json/qjsonwriter.cpp src/corelib/kernel/qeventdispatcher_blackberry.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f
| * Fix rotation of text in vertical QDockWidget titlebars in QFusionStyle.Parker Coates2013-07-021-0/+4
| | | | | | | | | | | | | | | | | | | | Presumably this was just an omission when QFusionStyle was first written. These three lines were taken directly from the equivalent portion of QWindowsStyle and seem to work as expected. Task-number: QTBUG-31904 Change-Id: I2f288d3cf2bfa3fe4f7f4a71e2726a172ec8e1b3 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | QStyle - tooltip - add wakeDelay and sleepDelay as styleHintsThorbjørn Martsum2013-07-033-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In earlier patches we allowed the user to control the tooltip duration. However the user still couldn't control the wake delay and sleep delay. This patch changes that and is the final patch in solving: Task-number: QTBUG-1016 Change-Id: I5e2c719737634ad7f371ad03691744612472ae70 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-272-8/+17
|\| | | | | | | | | | | | | | | Conflicts: configure mkspecs/features/create_cmake.prf Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5
| * QMacStyle: fix auto-default button animationJ-P Nurmi2013-06-262-8/+17
| | | | | | | | | | | | | | | | | | Make sure to stop any previously active (auto-default button) animation when the auto-default button changes. Task-number: QTBUG-31668 Change-Id: Iaa9bfa485b11e49cd7f765d0e54b4e6391ad2f6d Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | QCommonStyle: use RSIP_OnMouseClick for SH_RequestSoftwareInputPanelRichard Moe Gustavsen2013-06-251-4/+0
| | | | | | | | | | | | | | | | | | | | Both Android and iOS needs the style to use RSIP_OnMouseClick (and qwindowscestyle and qwindowsmobilstyle as well, it seems) so set it as default (instead of expanding the #if test even more). Change-Id: I93a78e11031b506c2cb80f30f1946fe25f7945a9 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-06-245-31/+40
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-205-31/+40
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp tools/configure/configureapp.cpp Change-Id: I3092bd3276af14304b7ab3ae1e1cc05d11cdede0
| | * Doc: remove the duplicate for in QStyle documentationLiang Qi2013-06-191-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-31739 Change-Id: I72ad52da7d7e6899148a91d22266e79dd3184d4c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * fix auto-enabling of windows styleOswald Buddenhagen2013-06-191-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | it needs to come after the vista and xp style blocks. Change-Id: I66b5c1eff41b19a76802a77b6926552d7343b29c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 03:24:07 +0000