summaryrefslogtreecommitdiff
path: root/src/controls/Styles
Commit message (Collapse)AuthorAgeFilesLines
* Calendar: fix bug when NaN is displayed instead of dateOleg Yadrov2017-12-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | I fixed a similar issue last year on the JavaScript side: 094ad30c94a72784449f43ef06d2172d644ab0fd At this time the same thing has been happening in C++. See QTBUG-54559 and the patch for a detailed explanation of the issue. In short, the problem with Calendar is that internally it uses QDate which does not keep information about time, whereas in the JavaScript world date is always combined with time. So, QDate(2017-10-15) is valid, but when during QDate -> JS Date transformation we add time to it (which defaults to midnight (00:00)), it becomes invalid in time zones where the Daylight Saving Time -> Standard Time transition takes place at midnight. To avoid switching the entire QQuickCalendarModel1 to using QDateTime, I modified its date(...) and dateAt(...) methods to return QDateTime with the time part always set to 12:00. That transformation required more changes in QQuickRangedDate1, because Calendar::selectedDate internally is QQuickRangedDate1::selectedDate, and I also had to fix "selected" property binding in the Base Calendar Style as it did take into account the time part of the date, which resulted in wrong behavior with my changes. Task-number: QTBUG-64068 Change-Id: Ia2f7703ff4e5811ef79438c97739da1d8001a7f5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix ScrollView scrollbar handles when there is no contentJoni Poikelin2017-11-281-2/+2
| | | | | | Task-number: QTBUG-64052 Change-Id: I047255d90ee5f807d2b7b5567aa6559fa8c08499 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-181-1/+1
|\ | | | | | | Change-Id: Ife389a8fd4df1eef4f521ff734d02748b25ec184
| * Fix "Unable to assign Object to QString" warningJason Erb2017-03-111-1/+1
| | | | | | | | | | | | Change-Id: Ic219be7b90cbcde8fcc6a2e4d4a598a5d38b1d47 Task-number: QTBUG-47539 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Take enabled property into account when styling MenuBar itemTuomas Vaarala2017-03-111-2/+2
| | | | | | | | | | | | | | | | | | | | When the MenuBar item's property enabled is set as false: - Gray out the MenuBar item text. - Disable the blue highlighting of item when selected. Task-number: QTBUG-59335 Change-Id: I2fb0eb5539bdeaf487f0fc5d499ace72e6c916b7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1Liang Qi2017-01-252-3/+2
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I64e4c4f9ca56b263d8f00d3ba6a1067d78f26065
| * ScrollViewStyle: Limit maximum scroll bar sizeKai Uwe Broulik2017-01-161-2/+2
| | | | | | | | | | | | | | | | | | Avoids the scroll bar overflowing its container. This can happen when e.g. contentWidth/height becomes zero. Change-Id: Ib01e65535ef1f11e32aaca8b19ec93f5ebf99736 Reviewed-by: Marco Martin <notmart@gmail.com> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * [Desktop GroupBoxStyle] Don't hardcode textureHeightKai Uwe Broulik2017-01-021-1/+0
| | | | | | | | | | | | | | This fixes skewed GroupBoxes in Plasma's config dialogs when using larger fonts. Change-Id: Ie850658da3f47d57eed0904c26dbbb26457a83e8 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Remove support for WinRT 8.1 and Windows Phone 8.1Maurice Kalinowski2017-01-1925-1023/+0
| | | | | | | | | | | | Task-number: QTBUG-57288 Change-Id: Ic57422aab1232e4309a1a4e6d2101f46e7e7ee32 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-211-1/+1
|\ \ | |/ | | | | Change-Id: I20f0f7a50b55907f4a6e574bdfe92bc9538879d6
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-181-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/controls/Private/qquickrangemodel.cpp src/controls/Private/qquickrangemodel_p.h src/controls/Private/qquickrangemodel_p_p.h src/layouts/qquicklayout.cpp tests/auto/controls/data/tst_rangemodel.qml Change-Id: I9c8f6326c6edf9ebb18dd538f76830e1b439ba8e
| | * CheckBox: fix missing indicator frame on certain DPIsMitch Curtis2016-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifying width and height is typically a bad idea, as they can be overridden by the layouting engine. implicitWidth and implicitHeight are better. Change-Id: Ib597f1fa98f82f00236c79bb5f9f07405593c35e Task-number: QTBUG-51842 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | TumblerStyle: deprecate spacing propertyMitch Curtis2016-09-021-0/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not only was this unused, but the idea doesn't make sense for Tumbler, which is internally based on PathView. Having gaps between delegates in a PathView means that there will be areas where the user cannot "flick" the Tumbler. The height of the tumbler can be increased and/or visibleItemCount can be decreased in order to achieve larger spacing between text. [ChangeLog][Styles][TumblerStyle] Deprecated unused spacing property. Task-number: QTBUG-55289 Change-Id: Ieadaac8678642d747820b201598745c7e099ead4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Doc: Add missing \qmlmodule and \inqmlmodule commandsTopi Reinio2016-06-221-0/+1
| | | | | | | | | | | | | | | | These are not strictly necessary as they are for internal types, but it makes it easier for QDoc to resolve the type inheritance. Change-Id: If4a2650fab5251081ae74b109bfb97220c25751c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix iOS style build on case-sensitive file systemsJ-P Nurmi2016-06-201-1/+1
| | | | | | | | | | | | | | Change-Id: I3704fd913d26646d8ecdf2a81680d66e8960704c Task-number: QTBUG-54192 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-102-5/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
| * Cleanup QQmlExtensionInterface usageJ-P Nurmi2016-05-061-1/+1
| | | | | | | | | | | | | | | | Use the pre-defined macro. Change-Id: I52e362672ff719202d3e40e4245baac2af29f624 Task-number: QTBUG-53208 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Improve DialStyle's valueToAngle() tests and documentationMitch Curtis2016-04-181-4/+0
| | | | | | | | | | | | | | | | The minimumValueAngle and maximumValueAngle variables it mentions are private. Change-Id: Ib95c96aeb218c8624857c212429f6c4e4e77ece2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | iOS: Let CursorDelegate respond to cursorFlashTime from style hintsRichard Moe Gustavsen2016-04-261-2/+6
| | | | | | | | | | Change-Id: I4d8cf26272767a82c89cc1119afecfe1a0fedabd Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | iOS: Remove text selection handlingRichard Moe Gustavsen2016-04-262-4/+0
| | | | | | | | | | | | | | | | Text selection and overlay are now done from the iOS platform plugin. Change-Id: I3903ab05816775f75708e915780f549e62797135 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-081-1/+4
|\ \ | |/ | | | | Change-Id: Ic78345c599719f3dd80b1d6a6004d46a085da4af
| * Clarify Slider::tickmarks' purposeMitch Curtis2016-03-091-1/+4
| | | | | | | | | | Change-Id: I53d43d03216425e7493e7381ea31f1dfbf553d58 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Controls: append "1" to all C++ classesMitch Curtis2016-03-185-44/+44
| | | | | | | | | | | | | | | | | | | | This is consistent with the classes that have already had this done. It prevents clashes with Qt Quick Controls 2. These classes are not available to the user, so it doesn't affect compatibility. Change-Id: Iee73ee6bc530182732ae95993e1f4fc3766eb8e0 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Make the iOS style a plugin so that it can be built for static correctlyAndy Shaw2016-03-183-28/+29
| | | | | | | | | | Change-Id: I60ae4aa9e0e1ffdc8f74a611202fef10df023b05 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Enable using the module in a statically built applicationAndy Shaw2016-03-152-1/+9
| | | | | | | | | | | | | | Task-number: QTBUG-35754 Task-number: QTBUG-45868 Change-Id: I9bb332bc85713a17f02f3e7e768592e3234edfe3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-02-04178-2136/+2670
| | | | | | | | | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I3c851bc24da89f6300b94199387d1adf16ca4f48 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-213-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: src/controls/qquickmenubar.cpp Change-Id: I4b036212b6dadded2c4d60dd07e91f629e80d9c2
| * Nicely centered spinner graphicsAlessandro Portale2016-01-043-0/+0
| | | | | | | | | | | | | | | | | | | | | | The current spinner circles are not exactly centered in the image rectangle. That causes the spinners to wobble slightly. The new .pngs were optimized via optipng -o 7 -strip "all" Change-Id: Ifdfefd19f9a482cb690c81ce67f97f163f4dc5da Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Replace foreach with range-based forAnton Kudryavtsev2016-01-161-1/+1
|/ | | | | Change-Id: Ieb9019b62696479a4e0317a590bceaeb30abf62c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix proxy menu crashJ-P Nurmi2015-11-171-0/+1
| | | | | | | | | | | | Mobile-centric ApplicationWindowStyle implementations (Flat & Android) use a proxy menu to morph menubar items into a single menu button. The items are owned by the menubar and must not be deleted by the proxy menu. Otherwise, depending on the destruction order, the items would get deleted twice. Change-Id: I92d0c45fc3274574fd1edf34d8d3d081990f2727 Task-number: QTBUG-48927 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Extras: fix DropShadow usage.Mitch Curtis2015-11-055-22/+22
| | | | | | | | | | It's now recommended to use the samples property instead of radius. The radius property is calculated for us based on the samples. Task-number: QTBUG-47749 Change-Id: Ic29c91a1ca9961c74a6ad727ff7c9c671bf55929 Reviewed-by: Gunnar Sletta <gunnar@sletta.org> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix CircularGauge's tickmark labels all being set 0Mitch Curtis2015-11-041-1/+3
| | | | | | | | | | | | | | We were relying on model.get() to somehow reevaluate after we'd updated properties of model items, which somehow worked until 4876ea6a18ccdfd72014582aa5d50ab9f6b6ec9e. The correct approach is to do the same thing as we do for styleData.index: rely on the model properties that are exposed to the delegate, which do get updated. Change-Id: I529ab7dcc142187fc185b11658dc5e1496b6d6db Task-number: QTBUG-48839 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* BasicTableView: Use ListView's overlay header for the table headerGabriel de Dietrich2015-11-032-6/+6
| | | | | | | | | | | | | | | | | | | | Previoulsy we manually positioned the table header over the table contents, which required some manual tweakings. Since 5.4, ListView support overlay headers that we can use them to clean our code in BasicTableView. There is, however, a small issue on Mac where the vertical scrollbar (specially in non-transient mode) is displayed below the table header. Since the header can't span beyond the ListView boundaries, we need to account for the vertical scrollbar width in the ListView's content width. This patch also updates the Desktop style to set the transientScrollBars property and some small tweaks to the Base style. Change-Id: I4433d0703328f23eadb0ae4563fbef5bba0168db Task-number: QTBUG-34344 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Simon Hausmann2015-10-021-2/+2
|\ | | | | | | Change-Id: Ie26c941c33fdd8baab49dc13b84d02e2b83af5e1
| * ScrollViewStyle: Avoid division by zero in handle positioningGabriel de Dietrich2015-09-221-2/+2
| | | | | | | | | | | | Change-Id: Iceef723a407f49d36b288e50df3dec9debbe9ba7 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-08-281-0/+2
|\ \ | |/ | | | | Change-Id: Ie81aa6abe8a4acbd201e4938f0cb693a8b3aa567
| * Android: fix hw menu button to open the options menuJ-P Nurmi2015-08-191-0/+2
| | | | | | | | | | | | Change-Id: I9cc08b64521f414b50598aead3957347ff30528a Task-number: QTBUG-45131 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Tree- & TableView: Fix non-left aligned text marginsGabriel de Dietrich2015-08-072-4/+9
| | | | | | | | | | | | | | | | | | | | | | This happens for both the item and header delegates. Previously, we were only taking left alignment into account. This resulted in poorly aligned item delegates with relation to the column header. Change-Id: I879d05cfb53641f02d5133a59fbe5a377b813f39 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Allow for styles to provide own EditMenuMarco Martin2015-08-072-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | Allow for styles to define their own EditMenu component, to provide cut/copy/paste actions with the platform style. In order to be able to provide mobile-optimized controls on Linux systems, use the boolean env var QT_MOBILE_PLATFORM in this case. This allows on a plain Linux system to offer controls with the touch friendly text selection handles and the little inline cut/copy/paste menu Change-Id: Id9013b4386423938735390325a003fcccdcfd598 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
* | Doc: Create proper QHP TOC entries for QML types, examples and tutorialsTopi Reinio2015-08-052-0/+2
| | | | | | | | | | | | | | | | | | | | QDoc now supports using a \group name as a selector for QHP subprojects. Use this to have the correct division of Qt Quick Controls and Controls Styles QML types, as well as a TOC entry for examples and tutorials. Change-Id: I8e4b44c8876fd6bb3b2baebd956d6dc5d5223715 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Base/TreeViewStyle: Fix first column marginGabriel de Dietrich2015-07-271-3/+4
| | | | | | | | | | Change-Id: Ib95cf01c2dfc9087101e73647df5ea7975af172d Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Desktop/TreeViewStyle: Fix first column marginGabriel de Dietrich2015-07-232-3/+3
| | | | | | | | | | | | | | | | | | | | The margin was different depending on the item's depth resulting in an extra indentation for those items of depth zero. We fix this, and also set the proper inden- tation from the style. Change-Id: I8c9babd4b7c8b413f5c46cb756682eae4bf86892 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devGabriel de Dietrich2015-07-224-12/+1
|\ \ | |/ | | | | Change-Id: I689c18ad192a38581d3058e2a555d6438a8d08e2
| * Make MenuBar, Menu properly accessibleGabriel de Dietrich2015-07-152-10/+0
| | | | | | | | | | | | | | | | Previously, we had the accessibility settings in the desktop style (only!). Now it's been moved into the actual control implementation. Change-Id: Idb90d164dfd7a72c8188accd9e4fa3b02d567a94 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
| * Extras: remove version requirement notices.Mitch Curtis2015-07-061-2/+0
| | | | | | | | | | | | | | | | | | The entire module is "new" with 5.5, and there are already \since statements in place declaring this. Change-Id: I76bc2941a520a82de0bd9780ac1786d5430acd0f Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Fix cursor handles remaining visible after losing focusJoni Poikelin2015-07-011-1/+1
| | | | | | | | | | | | Task-number: QTBUG-46960 Change-Id: I9198cdac67fdc42ad4ff24d07bdf09357d967140 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Fix invisible cursor handles from preventing touchesJoni Poikelin2015-07-011-0/+1
| | | | | | | | | | | | Task-number: QTBUG-46881 Change-Id: I5f994cd99664ffd6d8f05777e2a4f04fa1639b88 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-291-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8a32df546611d7a8105ad31ed72f54dbac0b1250
| * Fix transientScrollBars conditionKai Uwe Broulik2015-06-181-1/+1
| | | | | | | | | | | | | | | | | | It should only ever be enabled on mobile. Fixes a regression introduced by f7b3f11b47768f47f625874c1bd45da4296c0f82 Change-Id: I0c95e6caff8e5bb745fd0d03567b0041f012c9b5 Task-number: QTBUG-41591 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-0332-2/+4
|\ \ | |/ | | | | Change-Id: Ia13e89e7aaa2a58d15b52d13c0bbd4c4b12c8bf9
View Lorry Controller Status