aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add MenuSeparatorMitch Curtis2016-07-2520-0/+615
| | | | | | | | | [ChangeLog][Controls] Added MenuSeparator to visually distinguish between groups of items in a menu. Change-Id: I7a52910b19633ed1188c90ca56c92346a28d4d5c Task-number: QTBUG-54862 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Universal: determine the default hoverEnabled value from QStyleHintsJ-P Nurmi2016-07-2220-0/+40
| | | | | | Change-Id: I76857a7ea88db3d47415580a83fa4431b732a0f2 Task-number: QTBUG-50003 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Material: determine the default hoverEnabled value from QStyleHintsJ-P Nurmi2016-07-2220-0/+40
| | | | | | Task-number: QTBUG-50003 Change-Id: I4809638c7ddaa4ca6fb99dbc734edb3641ecea05 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-07-2210-39/+380
|\ | | | | | | Change-Id: I82c2b8d97d639e24147118a2ca6276ae70195b45
| * Fix overlay event processing order for popupsJ-P Nurmi2016-07-223-14/+79
| | | | | | | | | | | | | | It should follow the stacking order of popups. Change-Id: Id5664496c60e99bdf0aa4b2dc6a2c94dba2c756a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix hover event handling for drawer overlaysJ-P Nurmi2016-07-224-2/+142
| | | | | | | | | | | | | | | | | | | | Closed drawers sit visible at the window edge to be able to pull them out. Don't block hover events when drawers are fully closed ie. when their overlays are fully translucent. Task-number: QTBUG-53419 Change-Id: I5bdbed5a2cf3ad6972634432ac79f7fbe5054b98 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Don't leak hover events through modal overlaysJ-P Nurmi2016-07-222-1/+19
| | | | | | | | | | | | Task-number: QTBUG-53419 Change-Id: I5c1ce684cff7954f9c011e991e3924741ad44367 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Don't leak hover events through popupsJ-P Nurmi2016-07-223-0/+124
| | | | | | | | | | | | Task-number: QTBUG-53419 Change-Id: Ia3e23538bfba09454c9b473d8394814890ada150 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Popups: fix overlay visibilityJ-P Nurmi2016-07-223-22/+13
| | | | | | | | | | | | | | | | | | | | Make sure popup overlay dimmers gets destroyed when popups are closed, and thus, re-parented out of the window overlay. The window overlay item is hidden when there are no child items, so this fixes the issue that the window overlay item was left visible after closing popups. Change-Id: Id2ffe43b706ffcc5cda83abd75354ef04f893745 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * testbench: center the window upon completion instead of using bindingsJ-P Nurmi2016-07-201-2/+5
| | | | | | | | | | | | | | | | | | The x/y bindings to screen center cause troubles when moving the window between screens. At least on OS X, the x/y bindings prevent moving the window to a second screen (it snaps back). Change-Id: I238e278c5338e926633be518143f22b5b18a4422 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickTumbler: change asserts to if-checksJ-P Nurmi2016-07-221-5/+3
| | | | | | | | | | | | | | The asserts made qmlplugindump crash when run for QtQuick.Templates. Change-Id: Ic18424555963640af806050f1e243e3b9bcfe993 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update plugins.qmltypes for templates and controlsJ-P Nurmi2016-07-223-431/+706
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For src/imports/templates, simply running 'make qmltypes' does the job. With src/imports/controls, we must help qmlplugindump a bit: - pass the correct dependencies in a JSON file (or else qmlimportscanner will find .impl imports, which qmlplugindump will fail to import as stand-alone modules) - merge with the plugins.qmltypes from templates to achieve proper type hierarchy The full command for dumping QtQuick.Controls 2.1 types, also seen at the top of src/imports/controls/plugins.qmltypes: qmlplugindump -nonrelocatable QtQuick.Controls 2.1 \ -merge ../templates/plugins.qmltypes \ -dependencies dependencies.json Change-Id: I2d8a24e47e70dd8dd27a2f48fe640faeea8761e2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | tst_button: stabilize auto-repeat testsJ-P Nurmi2016-07-221-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a busy CI environment, the wait loop of tryCompare/Verify(), which is based on timers, may slip through more auto-repeats than expected. Ideally the repeat count should match the expected value of 2, of course, but we can accept the result as long as there are at least 2 repeats that verifies that the button actually starts repeating. It now throws warnings when it happens, which it has now done several times in the CI recently. It should basically never happen when running the tests locally (neither has the test failed when run locally). Change-Id: I2a7faaca7f11094512d68955b581fdf71b014d92 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Material: fix ripple wave position on mouse ungrab / button cancelJ-P Nurmi2016-07-211-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickMaterialRipple compared the anchor item to QQuickWindow's mouseGrabberItem to ensure that only mouse-pressed buttons would use the press point, whereas key-pressed buttons would use the center point. However, this does not work in case the mouse grab was stolen: when first pressing an ItemDelegate and then dragging the containing ListView, the ripple wave would always appear from the center point, not from the press point as it should. Since QQuickAbstractButton::keyPressEvent() sets the press point as the center of the control, the mouseGrabberItem check can be simply removed. Change-Id: Ic24e5e80c9d849f3fe2684013dd40b004ef55b57 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: cleanup the ripple color bindingJ-P Nurmi2016-07-211-1/+1
| | | | | | | | | | | | | | | | The binding was copied from Button, and 'control.checked' condition was accidentally left there. Such property doesn't exist in ComboBox. Change-Id: I11b56e2da997ab2519a63527f58faff3d1bb4d8b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: rename ripple color propertiesJ-P Nurmi2016-07-2117-25/+25
| | | | | | | | | | | | | | They are no longer specific to CheckBoxes, but used in most controls. Change-Id: I404aeab706479d0b666529ebdb09caa6b8085cae Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: use the new .pro syntax for RESOURCESJ-P Nurmi2016-07-211-12/+3
| | | | | | | | | | | | | | | | A .qrc file is no longer mandatory. One can list resources directly in the RESOURCES variable. Change-Id: I172b6cfa0a16c3296794888bd2f40a4273739c32 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add ToolSeparatorMitch Curtis2016-07-2125-0/+814
| | | | | | | | | | | | | | | | | | | | ToolSeparator is used to visually distinguish between groups of items in a toolbar by separating them with a line. It can be used in horizontal or vertical toolbars. Task-number: QTBUG-54862 Change-Id: Ie68e680510428ad19e7f80268063af07b61100eb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Tests: use the new .pro syntax for RESOURCESJ-P Nurmi2016-07-214-12/+2
| | | | | | | | | | | | | | | | A .qrc file is no longer mandatory. One can list resources directly in the RESOURCES variable. Change-Id: I06b5ba97ade6fe42f7bd6273ead26dcbeab96bde Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Gallery: use the new .pro syntax for RESOURCESJ-P Nurmi2016-07-212-66/+4
| | | | | | | | | | | | | | | | | | A .qrc file is no longer mandatory. One can list resources directly in the RESOURCES variable. This results to a flatter Resources-tree in Qt Creator's project tree. Change-Id: If272e4a7974f433552cb848ddc83827dd09669d6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickMaterialStyle: cleanup several unused colorsJ-P Nurmi2016-07-212-90/+5
| | | | | | | | | | | | | | | | | | These are no longer used now that the hovered and focused states are visualized by the ripple background, and the pressed state by the ripple waves and the elevation shadow. Change-Id: Ia2d315c2d8b31e4fcd77534f6128584b9daeb8d8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickTumblerView: add missing override keywordJ-P Nurmi2016-07-211-1/+1
| | | | | | | | | | | | | | | | qquicktumblerview_p.h:90:10: warning: 'updatePolish' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] Change-Id: Iae769691c3aab5092bab497f8e0bc43a4972a32a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: add missing ripple effect to SpinBox buttonsJ-P Nurmi2016-07-201-12/+24
| | | | | | | | | | | | Task-number: QTBUG-54764 Change-Id: Ie038161264c989853b2b6ec0bfceb09a1cd1195c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: add missing ripple effect to SwipeDelegateJ-P Nurmi2016-07-202-3/+18
| | | | | | | | | | | | Task-number: QTBUG-54764 Change-Id: Ie04c93a823745b6d0a85e0c80c91d4e7f77f6fcd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: remove double press effect from delegatesJ-P Nurmi2016-07-206-7/+6
| | | | | | | | | | | | | | | | The press effect is visualized by the ripple background, so we don't need to adjust the control background color when pressed. Change-Id: Ic3acea4591d59f3045004b7e85a5b5bb9044c9f2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add manual test app for buttonsJ-P Nurmi2016-07-205-0/+195
| | | | | | | | | | | | | | | | Buttons have so many different states that it's useful have a test app that can be used to visualize various states in different themes. Change-Id: Ia714c1d769aa13529c3117852b0d9b625a50d7d0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: revise Button visualsJ-P Nurmi2016-07-202-27/+15
| | | | | | | | | | | | | | | | | | | | | | Pressed buttons were way too dark, and ripples weren't even visible for highlighted buttons. Now that we have ripples, we don't need to use so many different color shades to present various button states. Also, visualize the checked state with a little accented bar like the Android ToggleButton does. Change-Id: Id717b658bfe70ba211e4da5a6addc6e10a2df3e5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Tumbler: don't crash if attached to a non-ItemJ-P Nurmi2016-07-202-14/+16
| | | | | | | | | | Change-Id: I84702195fa09af53697c987efd8c87afd429f3c4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-07-204-7/+36
|\| | | | | | | Change-Id: Idf19dd882ba3015be2afda6988cac1e95a4912fa
| * ComboBox: add custom popup example snippetJ-P Nurmi2016-07-191-3/+30
| | | | | | | | | | Change-Id: I9e393d3db42ba21ee2e1cd231bb91fd55bcace46 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * differences.qdoc: clarify Button.qml exampleMitch Curtis2016-07-191-2/+3
| | | | | | | | | | | | | | | | import "controls" was supposed to refer to a directory named "controls". Change-Id: I6e977354fa1ce01b1c14dda378d077b1003cb21a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Doc: minor language correctionNico Vertriest2016-07-191-2/+2
| | | | | | | | | | Change-Id: Iec9a8126cf424925fbe74d1f4dfb6a1d55fc2e64 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickStackView: claim QObject ownership for dynamically created itemsJ-P Nurmi2016-07-181-0/+1
| | | | | | | | | | | | Change-Id: I08030cab226c3e1f602e922fa1cad0a260e0c0ad Task-number: QTBUG-54552 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: improve Button's ripple effectJ-P Nurmi2016-07-191-2/+2
| | | | | | | | | | | | | | | | | | Trigger ripples on press for flat buttons, on release for raised buttons. Use highlighted (colored) ripple for highlighted (colored) buttons, not for checked (not colored) buttons. Change-Id: Ic7a6de070e568792d39cc20af35229517b7fd69e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: tweak ScrollBar looks and behaviorJ-P Nurmi2016-07-183-16/+33
| | | | | | | | | | | | | | | | | | | | Model the Material style scroll bar after the Chrome OS scroll bar. This adds a hover effect, and makes the transient timeout much longer to make the scroll bars easier to use on desktop. Task-number: QTBUG-50003 Change-Id: I5b1798e6c6b04482eab21d56e48935e2a9c69250 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add DialogJ-P Nurmi2016-07-1821-16/+1183
| | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls] Added Dialog to provide convenience for handling dialog popups. Dialog integrates with DialogButtonBox, and provides convenient accepted() and rejected() signals. Task-number: QTBUG-51090 Change-Id: I776516738b82c0e5726769c054d6f2a956fb616d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | StackView: don't crash if attached to a non-ItemJ-P Nurmi2016-07-182-12/+13
| | | | | | | | | | Change-Id: Ifa7ef9b0960494df917f9f60bf8d94cbee0f4661 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | SwipeView: don't crash if attached to a non-ItemJ-P Nurmi2016-07-182-17/+16
| | | | | | | | | | Change-Id: I381d84c45cf6cd9b1209fd0d5c7441a9f7707664 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Universal: add missing hover effect for ScrollBarJ-P Nurmi2016-07-181-1/+2
| | | | | | | | | | | | Task-number: QTBUG-50003 Change-Id: Ia17ac68adfda3babbc12b9c3484d8c9c74c736fb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Gallery: round settings dialog's coordinates and sizeJ-P Nurmi2016-07-181-3/+3
| | | | | | | | | | | | | | | | Make sure it doesn't land between the pixels, which may look awkward with antialiased rectangles and graphical effects / shaders. Change-Id: If4919dd97670437ffe40a060fd8e1e72b5a982a3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | ToolTip: don't leak memory if attached to a non-ItemJ-P Nurmi2016-07-182-8/+7
| | | | | | | | | | | | | | | | | | Previously, it was casting the attachee object to an item and passing it as a parent to the QObject constructor. When attached to a non-Item, it passed a null pointer as a parent. Change-Id: I45933e39e3080ab8e010fa3f7257fdffce4db685 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Bump up IMPORT_VERSIONs in .pro filesJ-P Nurmi2016-07-154-4/+4
| | | | | | | | | | Change-Id: Icf62245d16d9f7c2b3652eec267115b41916149b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-07-1515-16/+211
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickswipedelegate.cpp tests/auto/controls/data/tst_swipedelegate.qml tests/auto/controls/data/tst_textarea.qml tests/auto/controls/data/tst_textfield.qml Change-Id: I244f4ead4d14238c41db0bd965d7a2938f2ea8fc
| * SwipeDelegate: vertically resize contentItem when swipe is completeMitch Curtis2016-07-152-4/+32
| | | | | | | | | | | | | | | | Otherwise the delegate's text doesn't change with height animations. Task-number: QTBUG-54780 Change-Id: I4e253b807e4765732a80100fca102b6650527948 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Improve unxpected signal warningMitch Curtis2016-07-141-1/+6
| | | | | | | | | | | | | | | | | | Give hints as to what could be the cause for the failure. A signal that is missing from the signals property will cause very confusing failure messages. Change-Id: Iefe7db2430b93ccc259a58482443d1116f67c456 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Doc: special notes for Component and url in StackView::push/replace()J-P Nurmi2016-07-131-0/+16
| | | | | | | | | | | | | | Adapted from Component::createObject() docs. Change-Id: I53e44cfbcb4e4f1cc407e09d4ee90724526c9411 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * SwipeDelegate: reposition contentItem, background on width changesMitch Curtis2016-07-123-7/+61
| | | | | | | | | | | | Change-Id: I6af4f1a4517e79f2e34b0bbca401b0eefd0c6ff4 Task-number: QTBUG-54660 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Document which controls consume mouse/touch eventsMitch Curtis2016-07-111-0/+6
| | | | | | | | | | | | Change-Id: I284b0d84363a172b2f11093b01157d00db69103a Task-number: QTBUG-54658 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * SwipeDelegate: document which items can be used in left/right/behindMitch Curtis2016-07-112-0/+11
| | | | | | | | | | | | Task-number: QTBUG-54658 Change-Id: Ie8bb1fa6669c7dd1cd18199d01c773a1854edad4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Drawer: fix dragMargin handlingJ-P Nurmi2016-07-112-4/+13
| | | | | | | | | | | | Change-Id: I7549509aef9a88af7e6a449bae52da273b0253d0 Task-number: QTBUG-54629 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 11:55:42 +0000