summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Close popup windows when application state changesold/5.2Gabriel de Dietrich2014-02-262-0/+9
| | | | | | | | | | | | | | | Nobody is telling the popup to close. If it was, that was probably as a side effect of the Qt::Popup flag on some platforms. Certainly not on Windows. We check for the application state as the application may use a popup to signal the user about some event happening, and we don't want to close the popup as soon as the user makes the application active again. Task-number: QTBUG-36474 Change-Id: If41f7bec696105e3c7d8897e9af5fc075c7b8933 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Set accessible name for RadioButtonFrederik Gladhorn2014-02-061-0/+1
| | | | | Change-Id: Iad011baa39f955681613656028c6ccf852a8f869 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Doc: Fix broken linksSze Howe Koh2014-02-067-13/+10
| | | | | Change-Id: Ibf4431b20b61c5e16c6936775647ba3eb0049abe Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Ignore selectByMouse on android until QTBUG-36515 is resolvedJens Bache-Wiig2014-02-042-2/+2
| | | | | | | | | | | At the moment mouse selection on android can make text input unusable when certain virtual keyboard features are enabled. This patch will temprorarily disable this feature on TextField and TextArea until we have a workable solution for these cases. Change-Id: Ia04db31d1e83ddfc47bec7519e5a78746e6626a9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Touch example: Fix back navigationCaroline Chao2014-02-031-10/+6
| | | | | | | The Key event needs to be in a item that has focus. Change-Id: I6f7293ac74b477e37c200dbb7ee8629d4f769d05 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Allow size hint changes during a rearrange.Jan Arve Saether2014-01-282-1/+39
| | | | | | | | | | | | | | | | | | Previously, we marked the layout as not dirty straight after a rearrange was done. However, in the case of when a size hint changed during a rearrange that would block the pending rearrange (since it only perform the actual rearrange if its dirty). Instead, mark the layout as not dirty *before* the rearrange. This will allow bindings such as implicitWidth: height to execute the pending rearrange. (Although such bindings are not encouraged) Task-number: QTBUG-36169 Change-Id: I75bd821a0ca4302026bd5dac01287ca3359d471b Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Controls: Fixed support for Keys attached property on controls allowing text ↵Liang Qi2014-01-2212-0/+384
| | | | | | | | | | | | | | | | | | | | | | | input By forwarding key events from the internal control. It includes TextField, TextArea, ComboBox, SpinBox. The key events from internal are Keys.forwardTo controls, then user could customize their own behavior for those controls. Autotest are included. [ChangeLog][QtQuickControls] Fixed support for Keys attached property on controls allowing text input, by forwarding key events from the internal control. Task-number: QTBUG-33493 Task-number: QTBUG-34101 Task-number: QTBUG-35763 Change-Id: I00ea131160e55048b34fe0713e1ee02ff9472f05 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Fix StackView documentationJens Bache-Wiig2014-01-221-2/+2
| | | | | | | | | The extra "property Component" breaks the examples. Task-number: QTBUG-35864 Change-Id: I1317f9a2ce42f4d9e4a03ecc3b85286b1eb3e855 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Fix implicit width for SpinBoxJens Bache-Wiig2014-01-221-0/+4
| | | | | | | | | | | | | | This patch ensures that we take the minimum width of the SpinBox into account when getting the size from the style item. The patch still relies on the height of the TextField since we want to ensure that they keep similar height and the existing spinbox code behaves somewhat erratic. Task-number: QTBUG-36283 Change-Id: I50d14e5afb2576548c381e7f70063dfcb727e7d6 [ChangeLog][QtQuickControls]Fixed implicit width for SpinBox Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Remove unused white rectangle causing drawing issuesMartin Klapetek2014-01-211-5/+0
| | | | | | | | | | The spinbox has a white rectangle which overlaps the frames with some styles (eg. oxygen). However the Rectangle itself serves no real purpose and so it's removed. Change-Id: I37a6862dfd8ac21fb24b54261fa7d7ab54aa23c7 Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix TextField::placeholderText docsJ-P Nurmi2014-01-211-1/+1
| | | | | | | | | For usability reasons the placeholder text is kept always visible when the control is empty, even when focused. Task-number: QTBUG-36303 Change-Id: I79733b0cf2a48807fb45d5697399f183c2b97f94 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Fix typo in property in ComboBoxStyleDavid Edmundson2014-01-163-6/+9
| | | | | | | | | drowDownButtonWidth seems to be a typo in an exposed property name. In order to keep compatibility an (undocumented) alias is added. Change-Id: I2ab04b3518325e339c31cf6f403c488256a4aabe Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Support negative layout spacings (do not assert)Jan Arve Saether2014-01-162-1/+41
| | | | | | | | | | | | | | | | This tests * default spacing * explicit positive spacing * negative spacings Negative spacings that causes the layout to shrink down to 0 or a negative spacing are not supported. (But make sure they don't crash the whole engine) Task-number: QTBUG-35741 Change-Id: I69521dffb03c35a63db37ab51a2e99152d88272b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Don't lie in the docs.Jan Arve Saether2014-01-161-4/+4
| | | | | | | | It seems we forgot to update the documentation when the default spacing got changed to 5. Change-Id: Id76ebd3d75ec5c0d5806aab65723d046c0f49864 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Bump MODULE_VERSION to 5.2.2Sergio Ahumada2014-01-161-1/+1
| | | | | Change-Id: I148e6396627239765059467605eda5a29761942e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* tests: update activeFocusOnTab to support editable ComboBoxLiang Qi2014-01-142-6/+48
| | | | | | | | | | ComboBox was editable since 4c184095d378622fb0c3bb1692b331b3cc04e010. It should get focus when editable is true in tab focus chain. The behavior was fixed in qtdeclarative side. Change-Id: I85f26e99e00f970b8603d8ca23b1e55daa52159b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* ComboBox: Allow setting currentIndex to -1 to clear selectionv5.2.1Gabriel de Dietrich2014-01-082-3/+39
| | | | | | | | Task-number: QTBUG-35794 [ChangeLog][QtQuickControls]ComboBox: Allow setting currentIndex to -1 to clear selection Change-Id: I034b061484ab095a9ec049fb3b35614b98bfb956 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* ComboBox: Don't suggest auto-complete text if editText is emptyGabriel de Dietrich2014-01-082-1/+2
| | | | | | | ... for editable ComboBoxes, that is. Change-Id: Ieda089f715e8252ae47bbbff647982f96ec5f797 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Add missing call to initResources needed for static linkingCaroline Chao2014-01-071-0/+6
| | | | | | | | Task-number: QTBUG-35674 Change-Id: If0b995fc8a28adf949189138106a2a1e7bd16147 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Do not loop infinitely if a span is larger than the layout extentJan Arve Saether2014-01-072-1/+26
| | | | | | | | | | | | | There is no point in searching through all cells to see if an item of columnSpan 3 fits into a layout with 2 columns, since it won't ever fit. So instead we detect this case early and ignore the item for inclusion. Task-number: QTBUG-35778 Change-Id: I3f7963df17b05b3eb14ba0bae49e5a885d15b33b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Make Label accessibleFrederik Gladhorn2014-01-032-3/+5
| | | | | Change-Id: If364332017669732fa429efe90c26000b01b0580 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Fixed: Regression in key navigation on TableViewJens Bache-Wiig2013-12-212-1/+29
| | | | | | | | | | | | It turns out the currentIndex/CurrentRow was updated but the selection, was ignored for the last row in a TableView. [ChangeLog][Qt Quick Controls][Fixed: TableView regression where the last row in a TableView could not be selected by keyboard.] Task-number: QTBUG-35572 Change-Id: Ifdf11f665733dd63ba56e12fe0dabdd7932a4ab9 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Menu: Don't create platform item for QQuickMenuItemContainersGabriel de Dietrich2013-12-175-20/+21
| | | | | | | | | | They don't have any QPA counterpart as they're just plain containers. This also removes that "Menu does not contain the item to be removed" warning on Mac. Task-Number: QTBUG-32197 Change-Id: I06e08817194c2e3ad3efd7ded193bfac9d3a1948 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Set style object on QStyleOptionFrames in QQuickStyleItemMartin Gräßlin2013-12-131-0/+2
| | | | | | | | | | | | For some controls an explicit QStyleOptionFrame is created. By setting the styleObject the QStyle can recognize that it's a QQuickItem and adjust the rendering. This is for example needed in the oxygen style to get the frame around a menu. Change-Id: I52d2a8b259477b2ff668827334d5073c6934f23c Reviewed-by: Martin Klapetek <mklapetek@kde.org> Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Make editable Combobox accept substringsJens Bache-Wiig2013-12-132-6/+25
| | | | | | | | | | | | | | | This fixes the issue that onAccepted would not update the currentText or current index if the string was a substring/partial match. Note that the new internal MatchFixedString case matches the complete string in a case insensitive way. [ChangeLog][Qt Quick Controls][Editable Combobox would not update currentText when accepting a substring of an existing value.] Task-number: QTBUG-35521 Change-Id: Ied850208425ae71b2414f1abf9389e9a8ed50cfb Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* SpinBox: fix selection behaviorJ-P Nurmi2013-12-121-3/+5
| | | | | | | | | | | | | | | Automatic value selection and focus must go hand in hand. A selection without focus is pointless, because one can't then type or even copy the value. This patch ensures that the automatic selection is only done when the control has active focus. Furthermore, manual selection is only enabled when either activeFocusOnPress is true or when the control has gained active focus by other means (activeFocusOnTab or programmatically). Change-Id: Id0c6a55a6f4a55eb419d06d5dcb3f25a36fe2ec5 Reviewed-by: Martin Klapetek <mklapetek@kde.org> Reviewed-by: Liang Qi <liang.qi@digia.com>
* Enable text eliding in base style tabsJens Bache-Wiig2013-12-121-15/+15
| | | | | | | | | This introduces text eliding in Base style tabs when there is not enough space to draw the entire text label. In addition it removes the need for clipping completely. Change-Id: I58be7c88bff275984b97b04c1bd1a942e9d256e0 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Don't animate the busy indicator when it is not showing.Gunnar Sletta2013-12-071-0/+3
| | | | | Change-Id: Ia53d8d46e0397ab94048c85245997be63960dc67 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* gallery: run particles only when visibleJ-P Nurmi2013-12-051-1/+1
| | | | | | Change-Id: I7c0f5565161719905e973d3fd1a75b3c9d8a4007 Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Make StatusBar and ToolBar focus scopesJens Bache-Wiig2013-12-042-2/+2
| | | | | | | | | | | | | | The problem is that the content item of both these controls have the focus property set to true. This property will then affect the implicit focus logic and should be protected by a focusscope. Currently adding a ToolBar or StatusBar to an application could result in this content item grabbing focus implicitly even if the application only sets focus: true on a single item. Task-number: QTBUG-34713 Change-Id: I94cb79d25e4cfd727915f5b5ab612ad5c0132db7 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix slider keyboard shortcuts in vertical orientationDavid Edmundson2013-12-041-2/+4
| | | | | Change-Id: Ib886a4bc9254d8e9c91ae52e927e651200b455a4 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Make slider's style react to mouse hoverMartin Klapetek2013-12-041-0/+1
| | | | | | | | | Paints the hover highlight around the slider handle when mouse hovers it. Change-Id: I883d5c5b97b0542a36e796ce6a07398ab67e94bd Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Update ScrollView documentation to be valid QMLDavid Edmundson2013-12-041-1/+1
| | | | | | Change-Id: Ie78468f6e001e67467175cd39bd4db1bd6b2dbbf Reviewed-by: Martin Klapetek <mklapetek@kde.org> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix disabled text color of TextAreaMartin Klapetek2013-12-041-3/+1
| | | | | | Change-Id: I5d09aa0da0675bce961f6445982cae16b894dbf1 Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Make scrolling on combobox workMartin Klapetek2013-12-041-19/+31
| | | | | | | | | Handles mouse scrolling event over combobox - scrolling up does the same as pressing up arrow and scrolling down equals pressing down arrow. Change-Id: I67adef46f201c0d4c88dabd5a717effc8f1e909d Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: David Edmundson <davidedmundson@kde.org>
* SpinBox: attempt to fixup the input as appropriateJ-P Nurmi2013-12-043-3/+40
| | | | | | | | | So for example "-0", which is a valid intermediate value, becomes "0" when the spinbox is accepted (enter) or it loses focus. Task-number: QTBUG-34774 Change-Id: Ie153294755aae2bf94ba1cb53c40a8fc5f1f5862 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-12-033-3/+10
|\ | | | | | | Change-Id: I1b4f7508ead5631abb70b4cdf29d6efa05f33b5b
| * Fix desktop style animations to stop when the control is hiddenv5.2.0J-P Nurmi2013-12-031-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QStyleAnimation automatically stopped for hidden QWidgets, but didn't know anything about QQuickItems and kept animating regardless of their visibility. QStyleAnimation was changed so that it will keep animating only as long as the animation target accepts animation updates. This change ensures that the style animation updates are accepted only when the control is visible. Note: In order to restart such style animations, QQuickStyleItem needs to be manually updated when it becomes visible. Task-number: QTBUG-35319 Change-Id: Ia053912883b9babb184a5467adfc90dd619b3dc5 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Fix typo in tableview example.Mitch Curtis2013-11-301-1/+1
| | | | | | | | | | | | | | Sortindicator => Sort indicator Change-Id: Id9897268bb21e9ba0dc14de2c4cc9e7f9f9a66d4 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Fix warning printed when using TabViewJens Bache-Wiig2013-11-301-1/+4
| | | | | | | | | | | | | | | | | | | | This fixes the binding loop warning that is printed in any application that makes use of TabView. It was casued by a QTBUG-35038 and a proper fix for that will be posted to the stable branch. Task-number: QTBUG-35134 Change-Id: Ia60c789d9fb8ee662215628fa9733b17cf9be90c Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Revise main() in examplesJ-P Nurmi2013-11-2820-56/+69
| | | | | | | | | | | | | | | | | | | | | | | | Replace the inconvenient QT_QUICK_CONTROLS_EXAMPLE_MAIN macro with a simpler macro that merely defines the actual application type. This way it's easier to do tweaks to main() when for example testing a different application font size. Moreover, browsing the example code becomes more convenient (especially online). Task-number: QTBUG-35083 Change-Id: I8203816a9112bf29b4661baa86bf4a196554db05 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | TextField: Fix binding loop for property fontCaroline Chao2013-11-271-1/+1
| | | | | | | | | | Change-Id: I752595495a3cb1347eb5f43dcf8ff36044a02e02 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Fix disabled text color of an editable ComboBoxJ-P Nurmi2013-11-271-4/+3
| | | | | | | | | | Change-Id: I2b38fa17434796be65a88d7c8d14ff94a7e2b233 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Docs: add missing \since 5.2 to TextFieldStyle::renderTypeJ-P Nurmi2013-11-271-0/+1
| | | | | | | | | | Change-Id: I1a8691a2ef06cc188be11e2f6d04973f9e1f9270 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Make TextFieldStyle and SpinBoxStyle respect font sizeJens Bache-Wiig2013-11-264-9/+28
| | | | | | | | | | | | | | | | | | | | This makes both the controls respect a custom font size. Before this patch these controls would only support the global application font. Task-number: QTBUG-34750 Change-Id: I200a14adba5b75088ab54ba691430330d9226ada Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | ComboBox: Call resolveTextValue() after any model changeGabriel de Dietrich2013-11-262-10/+14
| | | | | | | | | | | | | | | | Particularly if the nature of the model has changed (e.g., from null to array). Task-number: QTBUG-34936 Change-Id: If07690a8836dcd786ed7a32afda1e344d048d31f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-268-4/+224
|\ \ | |/ | | | | Change-Id: I470ff77e4a52f37263c8f0d9bf789f10c643d659
| * Set more window flags to keep Windows from omitting titlebar & buttonsv5.2.0-rc1Shawn Rutledge2013-11-231-0/+6
| | | | | | | | | | | | | | | | | | This should not be necessary, but Windows does not treat the missing Qt::CustomizeWindowHint the same as the other platforms do. Task-number: QTBUG-35049 Change-Id: I81dc645dc1acf29b6ff4d5fc04f5dd3db94b0133 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Revert "ApplicationWindow has the WindowFullscreenButtonHint flag by default"Jens Bache-Wiig2013-11-221-1/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 29d1b0d209ebb267c5a6ac8402c33892c09b8de6. This patch caused a regression resulting in QTBUG-35049 and should be reverted until we have a better fix. Change-Id: I76f9fa9859742a63f33757456c64f70183c76178 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * SpinBox: add editingFinished signalLiang Qi2013-11-223-1/+105
| | | | | | | | | | | | | | | | Autotest is included. Task-number: QTBUG-34780 Change-Id: I2da9d57b409c24cbf1d90ce42da9b4071dd6dac8 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
View Lorry Controller Status