aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Default: make delegates use palettesJ-P Nurmi2017-09-275-9/+7
| | | | | | Task-number: QTBUG-63369 Change-Id: Ie25329442763920b905c857c275472abaff9957c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add QQuickColor::blend()J-P Nurmi2017-09-272-0/+15
| | | | | Change-Id: I60dd2159e7c5c9bbdbea415ac3fe2e40881dbaba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make ToolBar & ToolButton use palettesJ-P Nurmi2017-09-272-6/+5
| | | | | | Task-number: QTBUG-63369 Change-Id: I7b8037c52892d8dfb4a38450c58101353d9d2d1f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make RangeSlider use palettesJ-P Nurmi2017-09-271-14/+6
| | | | | | Task-number: QTBUG-63369 Change-Id: I1f830dbfa2a723950fe0d10912fa459ab9968517 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make MenuBar & MenuBarItem use palettesJ-P Nurmi2017-09-273-4/+6
| | | | | | Task-number: QTBUG-63369 Change-Id: I61cc75166df05933782c24109e845411ef2aff0b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make MenuItem use palettesJ-P Nurmi2017-09-272-7/+9
| | | | | | Task-number: QTBUG-63369 Change-Id: Ic9e516f656d4115a0546f12e1fde46d4932c2901 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make Slider use palettesJ-P Nurmi2017-09-271-8/+4
| | | | | | Task-number: QTBUG-63369 Change-Id: I9b4535dbd6279314bb51b08a094bfb72054c9c2a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make Check/RadioIndicator use palettesJ-P Nurmi2017-09-274-18/+13
| | | | | | Task-number: QTBUG-63369 Change-Id: Iced34279af95caa62f097694c94c2ec34285f748 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: choose TextField background from the paletteJ-P Nurmi2017-09-264-9/+5
| | | | | | Task-number: QTBUG-63369 Change-Id: I371fbcdfe0cbea9e668d82912d6d7b5ed554542b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make Page use palettesJ-P Nurmi2017-09-261-1/+1
| | | | | | Task-number: QTBUG-63369 Change-Id: I4d9f50e324aba922061cdbedeea953f127270f32 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: replace remaining Default.focusColor with palette.highlightJ-P Nurmi2017-09-2615-32/+24
| | | | | | Task-number: QTBUG-63369 Change-Id: I37c1f4298fa01b907dfcb28757cd5d7ded182192 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make Dial use palettesJ-P Nurmi2017-09-263-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: Now that we have configurable palettes, we cannot assume that the default color of the indicator image matches the default palette color. Therefore we need to make ColorImage aware of the default color to avoid unnecessary expensive colorizing (see f0697c6). An extra QML property assignment of a constant value is much cheaper than colorizing the image. Starting from f0697c6, the indicator color has been defined like this: color: control.visualFocus ? Default.focusColor : undefined This assumes that the image has a default color of #353637 when not focused. With this, qmlbench delegates_dial.qml gives a result of 76 frames. The following options were considered: A) color: visualFocus ? palette.highlight : palette.dark => 71 frames B) color: visualFocus ? palette.highlight : palette.dark !== "#353637" ? palette.dark : "transparent" => 71 frames C) defaultColor: "#353637" color: visualFocus ? palette.highlight : palette.dark => 75 frames The last option was a clear winner. Task-number: QTBUG-63369 Change-Id: Ib8d56724de55b874d1c4ecdf0c09b91cfd2dc3df Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make separators use palettesJ-P Nurmi2017-09-265-10/+2
| | | | | | | | | Not the exact same color it was before, but it is now the same color Frame uses. Task-number: QTBUG-63369 Change-Id: I5b850d85d756d03b2502a8f56e972ed7ff5959a9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make panes and frames use palettesJ-P Nurmi2017-09-264-3/+5
| | | | | | Task-number: QTBUG-63369 Change-Id: I14cdbef627c4c689d6e0009de1d5dc04515c9c17 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make popups and windows use palettesJ-P Nurmi2017-09-2610-32/+25
| | | | | | Task-number: QTBUG-63369 Change-Id: Iabdb22852f319c1c7370b724f806523fcb1f1b91 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: choose DelayButton foreground from the paletteJ-P Nurmi2017-09-251-2/+2
| | | | | | Task-number: QTBUG-63369 Change-Id: Idc56f58f482610f3f745576b82d497d8e6dc19f1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make PageIndicator use palettesJ-P Nurmi2017-09-224-9/+1
| | | | | | Task-number: QTBUG-63369 Change-Id: I545b267cb69b4fd76e42c17d436362ee4e06c45a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make ProgressBar use palettesJ-P Nurmi2017-09-225-10/+4
| | | | | | Task-number: QTBUG-63369 Change-Id: Icf2204f9395798ccdca2448a26e0a2c9c4826a33 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make BusyIndicator use palettesJ-P Nurmi2017-09-221-2/+2
| | | | | | Task-number: QTBUG-63369 Change-Id: If752fc3c29aa01993d3803364814c5a9962a3657 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Imagine: fix imagine style screenshotMitch Curtis2017-09-221-0/+0
| | | | | | | It had some unrelated junk at the top. Change-Id: Ie6c394d3e8355e6117339d646e6384336b735bdc Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Imagine: add section to styles docMitch Curtis2017-09-222-0/+7
| | | | | Change-Id: I5d8a68d44dcfd1e3ed92361cc4706557ae253e3a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Default: choose RoundButton foreground from the paletteJ-P Nurmi2017-09-221-8/+6
| | | | | Change-Id: Ic596a7c237392e1a54591ac82b0b78ac806acf16 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: finish palette-support for TumblerJ-P Nurmi2017-09-221-1/+1
| | | | | | Task-number: QTBUG-63331 Change-Id: I5dbabc0c0a986761ce77b37c791e7a8fdd1034e2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make ToolTip use palettesJ-P Nurmi2017-09-222-1/+8
| | | | | | Task-number: QTBUG-63331 Change-Id: I42232ab2dc270b5a68bcf967517b2a00d3aad666 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: pick selection & selected text color from the paletteJ-P Nurmi2017-09-228-15/+10
| | | | | | Task-number: QTBUG-63331 Change-Id: I14c2b05bbf7654b298a69cdc72fc4d8756a340d0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: palette-based Label.linkColorJ-P Nurmi2017-09-225-8/+3
| | | | | | Task-number: QTBUG-63331 Change-Id: Iad940e2260b96f81282779e5029a498895a2da44 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: choose Button foreground from the paletteJ-P Nurmi2017-09-222-6/+15
| | | | | | Task-number: QTBUG-63331 Change-Id: I413a1c0297ba4cd6040a6c2974b7eec352ca5857 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: use palette.windowTextJ-P Nurmi2017-09-227-8/+10
| | | | | | | | | Make use of the "windowText" color role for those controls that draw text against the window background. Task-number: QTBUG-63331 Change-Id: If4ea4176caf9dab79dd3a6997f3edbcaed7e789b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: use palette.textJ-P Nurmi2017-09-2212-18/+30
| | | | | | | | | | Make editors and delegates use the "text" color role from palettes. This color role is normally used as a foreground color for the "base" background color. Task-number: QTBUG-63331 Change-Id: Ic08463f54c1b04a4eccf791a576ae792f75bf89b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Imagine: fix MenuItem arrowMitch Curtis2017-09-2216-0/+0
| | | | | | | | | | | It was white because menu previously had a dark background. The new assets have been optimized with: optipng -o7 -strip all *.png Change-Id: Ie59828612ae145b79f1e15d9f1f1db6a469b1020 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QQuickApplicationWindow: reduce the amount of re-layoutingJ-P Nurmi2017-09-211-0/+4
| | | | | | | | | | | | | | 80f6b14 introduced a binding loop in testbench: qrc:/testbench.qml:263:13: QML TabBar: Binding loop detected for property "implicitWidth" This issue is best to fix in QQuickApplicationWindow, which is causing the loop by being way too eager to force-resize the TabBar in the middle of calculating its initial implicit size. Let it complete construction first. Change-Id: Ie3d8679efc73002af6c37f17c138b2f1e9668897 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Imagine: fix SpinBox assetsMitch Curtis2017-09-2180-0/+0
| | | | | | | | | | | Some assets were not flipped correctly. The new assets have been optimized with: optipng -o7 -strip all spinbox*.png Change-Id: I411e89d5b000b0afd71421428f9754b3c6b13259 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2017-09-214-7/+12
|\ | | | | | | Change-Id: I237813241b35445d3372b84b0ef2759f3d2c5bcc
| * Default: improve TextField and TextArea stylingMitch Curtis2017-09-194-7/+12
| | | | | | | | | | | | | | | | | | | | - Remove top-level opacity assignments to allow full customization - Add more distinction between disable and placeholder text - Make disabled text more visible Task-number: QTBUG-62854 Change-Id: I2e8998fb739e4beda58978173173ca94a3759caf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: Maintain highlighted examples list locallyVenugopal Shivashankar2017-09-202-0/+36
| | | | | | | | | | | | | | | | | | | | Added more examples to the list. Task-number: QTBUG-60647 Change-Id: Ia63ffde2749fb85b8c4f2f8e06183863ce15726a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Imagine: fix QRC pathsMitch Curtis2017-09-1447-93/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using ApplicationWindow as an example, its NinePatchImage url is assigned like so: source: Imagine.path + "applicationwindow-background" If Imagine.path is set to ":/images" by the user, then the final URL would be: QUrl("file:///home/user/qt/qtbase/qml/QtQuick/Controls.2/Imagine/:/images/applicationwindow-background") We could use a QUrl for QQuickImagineStyle::path, but we don't want to support anything other than local paths. Instead, we add a private "url" property that returns a URL that we construct correctly in C++ ourselves, and then the Imagine QML controls files use that property. Change-Id: Ic4d1910bbc7f7b6f80f257496ae6131777a19401 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: ":/imagine" shouldn't be used in the same dir as the conf fileMitch Curtis2017-09-131-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Quoting JP: "To support qtquick designer, the style is allowed to be a folder relative to the location of the .conf. Location of the conf is ":/" and there's a folder called "imagine" which matches the name of the qqc2 style so it tries to use that as the style folder for the .qml files." Change-Id: I35d8bd4dadc62430bc70cd744e7084b1c0dba4bf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: add Imagine style screenshotMitch Curtis2017-09-121-0/+0
| | | | | | | | | | Change-Id: I7814182f7026f7d93f96a6166889e0d71bc67338 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: add "Asset Examples" section to Imagine docsMitch Curtis2017-09-122-1/+1887
| | | | | | | | | | | | | | | | This change adds a table of assets that designers can use as a reference when creating assets. Change-Id: I3de39889d14ccc87095d58a3582181349298fdcf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Imagine: clean up detailed descriptionMitch Curtis2017-09-121-7/+17
| | | | | | | | | | | | | | | | - Use the same format as the rest of the table. - Remove TODO, replace with section header Change-Id: Ic7ed6c4b5f297c3a5ac99bc17d1d6312690046b9 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | QQuickComboBox: fix attached Keys signal handlers when editableJ-P Nurmi2017-09-111-2/+5
| | | | | | | | | | | | Task-number: QTBUG-61135 Change-Id: I3f00cb81eeacbbddecc04d206bf13e602de15af7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2017-09-1111-20/+61
|\| | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquicklabel.cpp src/quicktemplates2/qquicktextarea.cpp src/quicktemplates2/qquicktextfield.cpp Change-Id: Ibbf6bc48972f58fbc6779a87ac9e2434c56c4db8
| * Fix font inheritanceJ-P Nurmi2017-09-114-9/+12
| | | | | | | | | | | | | | | | | | | | In item views, it can happen during incubation that a control doesn't yet have a window associated when the parent item changes. Therefore we must make sure to resolve the font when the window changes. Task-number: QTBUG-63119 Change-Id: I890f70ae6faa232dcc2c094ccec02e76b371d2cb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fully qualify atan2 with the std namespaceJake Petroules2017-09-081-1/+1
| | | | | | | | | | | | | | | | This fixes the build on VxWorks Change-Id: I5ba3d182184151b62e3ed6c0ab5e4d77a0e66768 Reviewed-by: Tuomas Heimonen <tuomas.heimonen@qt.io> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
| * Fix non-modal drawer drag/swipe open and closeMichal Policht2017-09-062-1/+26
| | | | | | | | | | | | | | | | | | | | Function QQuickPopupPrivate::blockInput() has been overridden in QQuickDrawerPrivate to accept events that occur while mouse/touch is grabbed and events within drag area. Task-number: QTBUG-59652 Change-Id: Icf4129e702a351b266ea9c4544830185c315fc37 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Android: fix clang compilation with -qreal floatVyacheslav Koscheev2017-09-013-6/+6
| | | | | | | | | | Change-Id: Ica7a417aa1bb531bc63e3fa9dda0505a6e552b67 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * QQuickSpinBox: fix initial value validationJ-P Nurmi2017-08-291-2/+4
| | | | | | | | | | | | Task-number: QTBUG-62508 Change-Id: I8981968c02b65d4b005eb9b54b0228fd51a3abda Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix a crash with ScrollView + TextAreaJ-P Nurmi2017-08-292-1/+9
| | | | | | | | | | | | | | | | | | TextArea was not cleaning up its geometry change listener on the Flickable it was attached to. Task-number: QTBUG-62292 Change-Id: I31223d4fcf0b46235b18e8eb05bab686a32f5481 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: add explicit importsJ-P Nurmi2017-09-062-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | To avoid problematic implicit imports: ASSERT failure in QQmlImportDatabase::importDynamicPlugin: "Internal error: Plugin imported previously with different uri", file qqmlimport.cpp, line 2072 Task-number: QTBUG-63037 Change-Id: I099bd88c6350853d3f0f525a7d9b8823f1f28f86 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Register new base class revisionsJ-P Nurmi2017-09-061-0/+5
| | | | | | | | | | | | | | | | QQuickText & QQuickTextEdit have gained new properties in QtQuick 2.10. Make them available in QQuickLabel and QQuickTextArea, respectively. Change-Id: I5156b683efeedd24b23c18d1c2e2509d3040b647 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 10:53:36 +0000