aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* testbench: fix orientation for horizontal ScrollBar & ScrollIndicatorv5.10.0-beta1J-P Nurmi2017-10-042-2/+2
| | | | | Change-Id: I1badecf98edb5174aa4cca71553e68bf20692801 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* imagine.sketch: fix button-backgroundJ-P Nurmi2017-10-031-0/+0
| | | | | | | | | Vertical content padding was off by one, and some flat buttons had wrong gray shade. Now buttons look identical when toggling between default and exported assets. Change-Id: I7d9bddb479292c18f500b0044a38a5ae420e6e59 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* imagine.sketch: remove white solid backgroundJ-P Nurmi2017-10-031-0/+0
| | | | | | | | | | | Most of the assets, exluding some handles and indicators, had a solid white background (for the entire image). In general, nothing should have a solid background, but the areas around button corners, slider track and so on should be transparent. This patch simply selected all exportable assets and unchecked "Background color". Change-Id: Idebc0811290e8617f1a8cf5c3ebef665f02b8b62 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* imagine.sketch: fix menuseparator-backgroundJ-P Nurmi2017-10-021-0/+0
| | | | | | | | Remove the solid white background, and make the 1px dots rectangles instead of lines. Change-Id: If31059bdbe10e04bcf9ff5b060c390761c0b4921 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* imagine.sketch: fix frame-backgroundJ-P Nurmi2017-10-021-0/+0
| | | | | | | | Sketch has known issues with 1px line elements. Use rectangles instead of lines for marking the content area. Change-Id: Idd3d1380637f0baeea206c0971f8fef3b1387cd2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: restore the style singleton attributesJ-P Nurmi2017-09-292-0/+73
| | | | | | | | | | | | It is known that people have made copies of the .qml files in order to customize them to their liking. Therefore it is best to restore the old API for now as it was in 391cba9a, before the palette changes. We will deprecate and remove it gradually, to give people time to migrate to palettes. Task-number: QTBUG-63369 Change-Id: Ib0c2166b00115b1e0ca92f3d81a05216798a7337 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make SpinBox use palettesJ-P Nurmi2017-09-291-6/+7
| | | | | | Task-number: QTBUG-63369 Change-Id: I2b31b35d61c61b37234c7da4ace75c4645bc076a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make ComboBox use palettesJ-P Nurmi2017-09-291-7/+8
| | | | | | Task-number: QTBUG-63369 Change-Id: I68270893bd7b56585095661b1cda21a28893c631 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Imagine: add Sketch fileMitch Curtis2017-09-291-0/+0
| | | | | | | | This contains the default assets for the Imagine style in Sketch's file format. Change-Id: If9658b8674a7c456fdfe7ddcd5bb83ba464a82bb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* testbench: add SpinBox states and tidy up existing onesMitch Curtis2017-09-291-3/+5
| | | | | Change-Id: I2d0cb1f5ec9073670fa00a86fa1ac85bd50b8373 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Doc: add cover flow screenshot of stylesMitch Curtis2017-09-296-0/+470
| | | | | Change-Id: I4ffcdbc519bd3e997552b5f4c1c81e01d5b1185c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Default: make RoundButton use palettesJ-P Nurmi2017-09-281-7/+4
| | | | | | Task-number: QTBUG-63369 Change-Id: I7d4b1f7f0ad0426a79b41534030b65774cd1b07f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make DelayButton use palettesJ-P Nurmi2017-09-281-4/+5
| | | | | | Task-number: QTBUG-63369 Change-Id: I1dfccfc2066c6346d7bd5e60105230446e047183 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make Button use palettesJ-P Nurmi2017-09-281-7/+4
| | | | | | Task-number: QTBUG-63369 Change-Id: I54826f9d76a8789ffc36dd2f613648c5553103e0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickActionGroup: track the checked button with a QPointerJ-P Nurmi2017-09-281-1/+1
| | | | | | | | | | Same as 3f1229b for QQuickButtonGroup, but testing this in QML seems too tricky since you can't use Repeater for non-Item Actions, and Instantiator does not provide a suitable list-property for the objects, that could be used to reproduce the issue. Change-Id: I43dfd76214b8b595be18cf4ab0d04ad1ff2a240d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickPaddedRectangle: prevent negative width and heightJ-P Nurmi2017-09-281-1/+4
| | | | | | | | | If the padding is larger than the available size, the rectangle node should not be given a negative size, because the node is still rendered and it results to undesired rendering artifacts. Change-Id: I082649badb04fe33dbea2ca2c4efcf0f179f41a8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: palette-based placeholder text color for editorsJ-P Nurmi2017-09-283-3/+5
| | | | | | | | | | | A half-translucent placeholder text color is also used in widgets. Tweak the default disabled text color a little bit to make placeholder text visible in disabled state, so that we can use the same approach that has been proven to work. ;) Task-number: QTBUG-63369 Change-Id: I9a3f0bf18fdfa4a25ef169b8fd9571c9c899ab26 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* testbench: add TextArea, TextField examples with placeholderTextMitch Curtis2017-09-282-5/+24
| | | | | Change-Id: Ib185b7b7592861c3ff5cf22050af7a5dfd5d4af2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Default: make ScrollBar & ScrollIndicator use palettesJ-P Nurmi2017-09-284-14/+2
| | | | | | Task-number: QTBUG-63369 Change-Id: Id649730f22b43d37a5ea8ff28bec22293356e4d1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make tabs use palettesJ-P Nurmi2017-09-282-7/+7
| | | | | | Task-number: QTBUG-63369 Change-Id: I92e9c33c3d98f863f6de3764a9796e8aa7a61a4f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make SwitchIndicator use palettesJ-P Nurmi2017-09-281-9/+3
| | | | | | Task-number: QTBUG-63369 Change-Id: Ife154914e49dd7946046984c61b22b551f6f7817 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2017-09-2763-121/+120
|\ | | | | | | | | | | | | | | | | | | Conflicts: .gitignore tests/auto/auto.pro tests/auto/qquickmenu/tst_qquickmenu.cpp tests/auto/qquickpopup/tst_qquickpopup.cpp Change-Id: I7e5a7b39d890796fd63a7b24ae19765ab41fecda
| * Rename tst_menu to tst_QQuickMenuJ-P Nurmi2017-09-2710-17/+17
| | | | | | | | | | Change-Id: I1c7e1a2b337e9d16bc6c9b098db08f29f1b9d1e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Rename tst_applicationwindow to tst_QQuickApplicationWindowJ-P Nurmi2017-09-2715-24/+24
| | | | | | | | | | Change-Id: If9fc2bb41cf251af71479b25656240e0d3c238d8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Rename tst_popup to tst_QQuickPopupJ-P Nurmi2017-09-2718-35/+35
| | | | | | | | | | Change-Id: I98f7081e94672a4454c33841934158ae82e9388f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Rename tst_Drawer to tst_QQuickDrawerJ-P Nurmi2017-09-2719-35/+35
| | | | | | | | | | Change-Id: I186b3ed95eda5178f861bc501be481c971641767 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | 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>
* | testbench: add MenuBarJ-P Nurmi2017-09-272-0/+80
| | | | | | | | | | Change-Id: I51adbdce78e535294faac33ba73a99149ef63f19 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>
* | testbench: allow focus in delegatesJ-P Nurmi2017-09-275-0/+10
| | | | | | | | | | | | | | | | QQuickItemDelegate sets Qt.NoFocus by default, but in testbench it's useful to be able see keyboard focus. Change-Id: I7a33cd5087279d111831d489cab1be8d93b60ec7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | testbench: fix Switch labelJ-P Nurmi2017-09-271-1/+1
| | | | | | | | | | Change-Id: I12fac13118cf27d7ed391df33a5a0a551a8764ef 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>
* | testbench: move the scrollbar on the window edgeJ-P Nurmi2017-09-261-1/+6
| | | | | | | | | | Change-Id: I52af7be7cbd838108cd9e18366afea90e26387a3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | testbench: make the search case-insensitiveJ-P Nurmi2017-09-261-1/+2
| | | | | | | | | | Change-Id: Ib14404986acd377ad00f19d8b7ec719dd0deeb16 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | testbench: ensure that assets are reloaded properlyMitch Curtis2017-09-262-6/+22
| | | | | | | | | | | | | | | | Clear the view's model, otherwise it will keep the old items around with the old assets, even after clearing the pixmap cache. Change-Id: If27400c0940448b337d1a4cd3ce0d6c99e2d9ddd Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | testbench: add modal and dim states for DialogMitch Curtis2017-09-261-1/+5
| | | | | | | | | | Change-Id: Ic7ed3b9712bb0e0e3e3eaa74ab10877b9ed86069 Reviewed-by: J-P Nurmi <jpnurmi@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>
* | Replace testbench with newer "style testbench"Mitch Curtis2017-09-2553-940/+4970
| | | | | | | | | | | | | | | | | | | | | | | | The style testbench was developed to provide a way for designers to test out their Imagine style assets, but since it is now more feature-rich than the old testbench, it seems like a good idea to replace it. The tool is described in README.md. Change-Id: I9abec1bc294fd176e2255e067af280b378961551 Reviewed-by: J-P Nurmi <jpnurmi@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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 11:43:16 +0000