summaryrefslogtreecommitdiff
path: root/src/controls/SplitView.qml
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-181-1/+5
|\ | | | | | | | | | | | | | | | | | | | | 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
| * SplitView: clarify how item sizes should be setMitch Curtis2016-09-051-1/+5
| | | | | | | | | | | | | | It's not exactly clear from the documentation. Change-Id: If173c63e080709c13b4a7b0bf18ef9b02eeec474 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Revert "Fix Controls 1 types linking to Controls 2"Topi Reinio2016-06-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | This reverts commit b5a8306bf6d4949066872ac2afc8d0a01f716bd7. The incorrect \inherits commands caused property documentation from base types go missing. Task-number: QTBUG-54150 Change-Id: I0bbe604a6fe904d8e6a4596777262255a794ec62 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix Controls 1 types linking to Controls 2v5.7.0-rc1v5.7.05.7.0Mitch Curtis2016-05-261-0/+1
| | | | | | | | | | | | Task-number: QTBUG-53529 Change-Id: I4933a03c49dee4e3edc56dd406f67073da341ac1 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Unify license header usageAntti Kokko2016-02-041-12/+15
|/ | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I3c851bc24da89f6300b94199387d1adf16ca4f48 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-11-171-1/+1
|\ | | | | | | Change-Id: Ic1a33d305dc57a42f020389277d95aad1a6da407
| * Doc: fix a typo and etc in SplitViewLiang Qi2015-11-041-1/+1
| | | | | | | | | | | | Task-number: QTBUG-48991 Change-Id: I2b2ca8270b6c25769d3b3214f052050c25f7f15b Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Doc: Create proper QHP TOC entries for QML types, examples and tutorialsTopi Reinio2015-08-051-0/+1
|/ | | | | | | | | | 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>
* Doc: Fix qml method signaturesCaroline Chao2015-03-131-2/+4
| | | | | | | | | | So the return value and parameters can be seen in the documentation. + Fix minor doc issues Change-Id: I99e520c103bb0faeb88b26eb7b9ff73922851abc Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Added remove function to the SplitViewFilippo Cucchetto2015-02-161-14/+81
| | | | | | Change-Id: Ie30e76356716a546f7eaa3e4c2eccbc15ebf9a5c Task-number: QTBUG-42509 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into devJ-P Nurmi2015-02-121-1/+1
|\ | | | | | | | | | | | | | | Conflicts: src/controls/TableView.qml tests/auto/controls/data/tst_gridlayout.qml Change-Id: I030bc50dc8fcf7b6b00e183dc3a67c3cd012f3fb
| * Disable hover on touchJ-P Nurmi2015-02-041-1/+1
| | | | | | | | | | | | Task-number: QTBUG-44267 Change-Id: I467f08ae6c5264b7e858022af9ff293117434018 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* | Controls: update license headersJ-P Nurmi2015-02-111-28/+24
| | | | | | | | | | | | | | Change-Id: I77e7a218a958d76ac7ef7780f4be52a81f76fa6b Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | Fix wrong calculation of "other" margins in splitviewJan Arve Saether2015-02-021-2/+2
| | | | | | | | | | | | | | | | | | | | The code was quite bogus, as it accessed item, which already was out of scope. The code should evaluate the "other" margin for each iteration in the loop, similar to how its evaluated for implicitWidth. Change-Id: I1e58b1f1ac8296ece550d1af173280ceb2fa2f8b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Add support for Layout.margins in SplitViewJan Arve Saether2015-01-171-15/+35
|/ | | | | | | Task-number: QTBUG-39724 Task-number: QTBUG-41559 Change-Id: I59ab8a4848fb3e0178eea15c068c21a61a6f8082 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.3' into devJ-P Nurmi2014-07-091-20/+35
|\ | | | | | | | | | | | | Conflicts: src/controls/ToolBar.qml Change-Id: I5510496219a4ebe8bfced4192307219238ca9bb6
| * Doc: Added images and missing snippetsVenu2014-06-271-20/+35
| | | | | | | | | | | | Task-number: QTBUG-33799 Change-Id: I582518a73276d47cf63cf31411b5176a90acab6f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | SplitView::addItem(): add missing \sinceJ-P Nurmi2014-05-151-1/+2
| | | | | | | | | | | | | | Change-Id: I53ed6999b4d8cd4d35fd96783fe46dc94242e8f5 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Christian Manning <cmanning999@gmail.com>
* | Add ability to dynamically add items to SplitViewChristian Manning2014-05-121-15/+33
|/ | | | | | | | | | | Factor out the loop body of init() into a pushItem() function to make the ability user-accessible. Can only append items due to the list property limitation. Takes account of item's fill property Task-number: QTBUG-35281 Change-Id: Ibb2a5e3cf945bede544cf6bf8eebe13ffd2f79e5 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Bump QtQuick.Controls import version to 1.2J-P Nurmi2014-04-071-1/+1
| | | | | Change-Id: Idc0b93cbfc2fe23e8be3bcaece672d06555a81f6 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Import QtQuick 2.2J-P Nurmi2014-04-071-1/+1
| | | | | Change-Id: Ifc9719ec6fbbd80b866c01eebc471d0ed121bd16 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* SplitView: wider splitter on touchscreensShawn Rutledge2014-01-101-4/+6
| | | | | | | | 7mm is a typical minimum size for anything meant to be touchable. Change-Id: Ie29d178495f0b9feae7e76ceaed848301232d2b8 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Doc: Changed the \since argument to the Qt version.Jerome Pasion2013-09-261-1/+1
| | | | | | | | | | | | | | -1.0 types were introduced in Qt 5.1 -1.1 types were introduced in Qt 5.2 -The module versions are now taken from the \qmlmodule This change was only applied to \qmltype. For methods, signals, and properties, we keep the \since QtQuick.Controls <version> Task-number: QTBUG-32172 Change-Id: Iefa73d4a489aa285bae873f68ae9a228030f0115 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Merge branch 'stable' into devSergio Ahumada2013-09-191-11/+12
|\ | | | | | | | | | | | | Conflicts: tests/auto/controls/data/tst_splitview.qml Change-Id: I07a169238e747d953b555911790fa782888b85e8
| * SplitView: fix hidden item after fillWidth item bugold/5.1Richard Moe Gustavsen2013-09-191-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the calculations in SplitView assumed that if item with index i was hidden, then so was handle at index i as well. This is not correct. The reason is that a the handle at i belongs to either item i or item i+1, depending on where the fillWidth item is. And this caused a bug when hiding the item to the right of the fillWidth item. Conflicts: tests/auto/controls/data/tst_splitview.qml Change-Id: I59967813f264a856181c57e32c4820d09d7eb363 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | SplitView: set handle's drag threshold to 0J-P Nurmi2013-09-161-0/+1
| | | | | | | | | | Change-Id: Ia886da389edad61a9837c722836de0b6ff641443 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Update imports to 1.1 and remove version from qmlmodule definitionJens Bache-Wiig2013-09-101-2/+2
| | | | | | | | | | Change-Id: Icb4c6d78225c072da787e4646a55d8cf71a5db7a Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Fix for script errors when unloading a SplitViewDavid McFarland2013-08-151-0/+10
|/ | | | | | | | | Disconnects all signals from child items on destruction Task-number: QTBUG-32526 Change-Id: Ib0b2e13be549164d4c967359856971c9d08d2a6f Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* SplitView: bugfix animating split itemsRichard Moe Gustavsen2013-07-111-1/+3
| | | | | | | | | Only assign a new width/height to a splitter item when needed (that is, the value was clamped). Otherwise we just end up breaking bindings and animations without a good reason. Change-Id: Ic33007713f6450d52c9f5bd958fca74095413638 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* SplitView: Always layout as if fillWidthItem is visibleRichard Moe Gustavsen2013-07-111-6/+6
| | | | | | | | | | | | | | | Hiding the fillWidth item in the splitter is allowed, but causes strange drawing/layout artifacts that can be difficult to understand since the layout engine would ignore all hidden items. This patch changes the implementation by adding an exception to the rule. The layout engine now treats the fillWidth item as if it is always visible. Then, hiding it would just reveal a white field where the fillItem would otherwise be, but the layout would otherwise look correct. Change-Id: I95ec51b595109e8f1efdc231c9a6697ee60aa483 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* SplitView: bugfix hiding splitter for last itemRichard Moe Gustavsen2013-07-111-3/+3
| | | | | Change-Id: I8953d7fa4f1a1a940029270d4cb8f3d69da07bf7 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* SplitView: support changing orientationRichard Moe Gustavsen2013-07-111-1/+35
| | | | | Change-Id: I8a5f7ec5bd6315a8a74ac6f8b5c9bc0d0f9c19fa Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-251-2/+0
|\ | | | | | | Change-Id: I1684510ce4f1b52e3569d8c04e272b1c8fd63c1a
| * Doc: Small fix for SplitViewCaroline Chao2013-06-241-2/+0
| | | | | | | | | | | | | | | | | | SplitView items must set width/height and not Layout.preferredWidth/Layout.preferredHeight. Change-Id: Ice888d51c63cbdaf6e0e235c0c7569c4a8794b7d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Doc: Add note to import QtQuick.Layouts when using SplitViewCaroline Chao2013-06-251-0/+3
|/ | | | | | | | | | In order to use the Layout attached properties. Task-number: QTBUG-31968 Change-Id: I00880b6a4ac91532db5da513d13757949fae64c2 Reviewed-by: Alberto Mardegan <mardy@users.sourceforge.net> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Doc: Fixes warningsCaroline Chao2013-06-031-4/+4
| | | | | | | | | | | Fixes issues including: - Misspelled links - Links to signal with arguments - \table in SplitView.qml - Links to current file Change-Id: I2cbadf661a641f19ed55f6854922b2b69966bc9c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Docs: fix missing/leftover docs, types, tags...J-P Nurmi2013-05-301-6/+17
| | | | | | Task-number: QTBUG-31262 Change-Id: I6bf48604b9392a2a9c63c344363188a4693a8547 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Consistent use of "hovered" and style API conventionsJens Bache-Wiig2013-05-291-22/+28
| | | | | | | | | | | We were still using "containsMouse" in a few places, and we should consistently add "hovered" to all button types for consistency. Also fixed the SplitView to follow the new style conventions. Change-Id: Iebc333c0cecc5bcde27e626b1a611c2f2edcf7dc Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Revert "Revert "Remove unneeded checks for -1 (infinity) in SplitView""Jan Arve Saether2013-05-161-4/+3
| | | | | | | | | This reverts commit a454ff7f445f50f86e947d9a7e528f36ca0e3c5e. This patch should follow patch 91fc9b1823c0a95190005f3baaa4aa227 Change-Id: I5e26da1d967f8880d73e32ad5a76c59bedf7a065 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Revert "Remove unneeded checks for -1 (infinity) in SplitView"v5.1.0-beta1Jens Bache-Wiig2013-05-111-3/+4
| | | | | | | | | This reverts commit c5270bdb7261deaeed13c49ba8b4c17825b5619b Since we reverted Change Ia638064f: Return infinity instead of -1 as a default value for max sizes, we have to revert this one as it depends on it. Change-Id: I765b67ac7c77074bbcf75fd3010d146d2e00a0b0 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Remove unneeded checks for -1 (infinity) in SplitViewJan Arve Saether2013-05-101-4/+3
| | | | | | | | | | | With commit 16558ac71509fe51a4cf18f238e4f61b37323fe4 Layout.maximumWidth and Layout.maximumHeight now returns Number.POSITIVE_INFINITY instead of -1. As described in that commit, comparisons against those properties does not need any special handling for -1 anymore. Change-Id: I8d4bba0fa87f9c67ac30dd40a8be8cb99abba283 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* SplitView: always respect min/maxRichard Moe Gustavsen2013-05-071-3/+6
| | | | | | | | | | | | | If the user sets Layout.maximumWidth on the fillWidth item, we now respect it. This can potentially make the splitview look buggy, since the fillWidth item might then be restrained from filling out remaining space. The same with the height of each item; you can now control the maximum height. This means that each item can end up with a different height. The upshot is that if you add items to a splitview that cannot grow, splitview will not try to resize it. Change-Id: If1cc82aefa939898a3b159da6b006f95af42599f Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* SplitView: rename 'expanding' to 'fillWidth'Richard Moe Gustavsen2013-05-071-34/+34
| | | | | | | | Rename variables to the new Layout terminology, to ease future maintenance/understanding of the code. Change-Id: I619f62a0280238fafefe261fae3f00eb575bb699 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* SplitView: update code to use 'clampedMinMax' functionRichard Moe Gustavsen2013-05-071-8/+1
| | | | | | | | This function was added in a previous patch, so reuse it for already existing code. Change-Id: Icd5daf195af7e249d4273bbc32a290bed5f0eaa5 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* SplitView: calculate implicit sizeRichard Moe Gustavsen2013-05-071-24/+50
| | | | | | | | Set the implicit size of the SplitView based on the sizes of the split items. Change-Id: I775b938215216831d10cb50868e4c6733e157eeb Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Doc: correct for compliancy with Writing GuidelinesNico Vertriest2013-05-071-0/+1
| | | | | | | | Task-number: QTBUG-30318 Change-Id: If3916f3250f202a5da4b1f8034ecfba984367af3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Do not clamp to Layout.maximum{Width,Height} if its -1Jan Arve Saether2013-04-181-1/+1
| | | | | | | This regressed due to 2ed163c6c6cb85b946b4166b3136d43336ff7adf Change-Id: Ib566dec33dad2f5dad5894ff94bd5ce09ecd515a Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Cleanup the superfluous \internal tags that are no longer neededJ-P Nurmi2013-04-081-2/+0
| | | | | Change-Id: I2eaaf7e82351e70a742eeadc32b8e1f8655a02c1 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Doc: minor language editsNico Vertriest2013-04-051-14/+15
| | | | | | | | | | | | | Concerning vocab., punctuation, syntax and/or Writing Guidelines. Corrected whitespace issues. Replaced "if" with "whether" in Slider.qml Task-number: QTBUG-30318 Change-Id: I0e0e8d2b807f0a6534deb2caa6dbee7eb206f43b Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org>
* Rename properties Layout.{vertical}SizePolicyJan Arve Saether2013-03-221-9/+9
| | | | | | | | | | | | | ..to Layout.fill{Width,Height} This property now takes a bool, which enables you to write Layout.fillWidth: true instead of Layout.horizontalSizePolicy: Layout.Expanding Change-Id: Icf2e0dc4757938489908b8997d6c4e80c8be1c50 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
View Lorry Controller Status