| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Change-Id: I19202b23a3027c7a24e15be2b929e9fc02aed044
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
| |
Change-Id: I8dfe1ddca7d06553450bd3b7906a05e3530c3a85
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|\
| |
| |
| | |
Change-Id: Iacaf1656f2a66df0a97641f855aaf4d9d9189e6d
|
| |
| |
| |
| |
| |
| |
| | |
Add a lot of missing controls and properties.
Change-Id: I7c0ff3cc7fd7220e338d78cac575091ff12abf48
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
|\ \
| | |
| | |
| | | |
Change-Id: I043c6f0484a3075db15687595026c0af76ba63ff
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I969a911c3e66aff502188ff9a103f16dc6544ba5
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| | |
A regression introduced by 0504150. A wrong binding for the x-coordinate
was chosen while merging CheckIndicator back to CheckDelegate.
Task-number: QTBUG-64430
Change-Id: Ia3b07e7537cc888406076c700ecd495a958cb7c1
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I792cd065a70aaabf2349e1fe2c5b5dc41e29d1d3
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Unfortunately this comes a bit late in the 5.10 cycle, but this should
be released together with the rest of the mnemonics stuff going out in
5.10, because it affects the value of AbstractButton/Menu(Bar)Item::text.
As the removed TODO comments and altered tests indicate, previously the
ampersand was blatantly stripped out. It would be worse to change it
later once people have already started using mnemonics and rely on the
behavior in custom styles.
The necessary modifications to QQuickText were added in qtdeclarative
commit 65ef4ba.
Task-number: QTBUG-61422
Change-Id: Iaa73da8c012e9a6019743cf98f5bdc02527064e5
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
The property was added in commit 19e7fb3.
Change-Id: Iae5e9f1076bc3312d78ffaf15027206ebd65046b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The handle can be positioned "between" pixels, leading to unpleasant
results:
https://imgur.com/a/GKItw
Round the position to avoid this.
Doesn't seem to be an issue for other styles that use Qt Quick
primitives rather than images.
Change-Id: Iddb21e37ff777de433b3fa2a68e640db9a4b369a
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Control's padding is supposed to be content padding, not background
padding. The background has a fixed height, so it's enough to set the
Y-coordinate to keep it vertically center aligned.
running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_progressbar.qml
[...]
Average: 205.8 frames; using samples; MedianAll=206; StdDev=1.30384, CoV=0.00633547
After:
running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_progressbar.qml
[...]
Average: 214.4 frames; using samples; MedianAll=214; StdDev=3.20936, CoV=0.014969
Change-Id: I4900bf496effa52e9291192e05ed95f4a44fbea4
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I7a691f7b7c3d2f2a9f1d9a1ded29269184ddfcfe
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
A binding to "<id>.<property>" is a tiny bit faster than a binding to
"parent.<property>". ID is a direct reference, like a pointer in C++,
whereas "parent" is a property so the binding is effectively depending
on two properties: "<property>.<property>".
The gain is not huge, but enough to show up in qmlbench. ;)
Before:
running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_menuitem.qml
[...] (10 repeats, all results between 65-66)
Average: 65.5 frames; using samples; MedianAll=66; StdDev=0.527046, CoV=0.00804651
After:
running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_menuitem.qml
[...] (10 repeats, all results between 66-67)
Average: 66.6 frames; using samples; MedianAll=67; StdDev=0.516398, CoV=0.00775372
Change-Id: Ib161fad3b11e19a4bb0f39900639131f36838d2a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
See the previous commit (CheckIndicator) for more details.
Before:
running: /home/jpnurmi/Projects/qmlbench/benchmarks/auto/creation/quick.controls2/delegates_switch.qml
[...]
Average: 87.8 frames; using samples; MedianAll=87; StdDev=2.16795, CoV=0.0246919
After:
running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_switch.qml
[...]
Average: 92.6 frames; using samples; MedianAll=92; StdDev=2.19089, CoV=0.0236597
Change-Id: Iea9e88e4e771ac27d336c2c87232704d33a226ec
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
See the previous commit (CheckIndicator) for more details.
Before:
running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml
[...]
Average: 91.6 frames; using samples; MedianAll=91; StdDev=1.51658, CoV=0.0165565
After:
running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml
[...]
Average: 95.8 frames; using samples; MedianAll=96; StdDev=2.04939, CoV=0.0213924
Change-Id: Ic185241767d0b9422e86919356e3155e00803e56
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The internal CheckIndicator helper was introduced together with
CheckDelegate in 1acb34a, because we naturally wanted to share the
indicator instead of duplicating it. This change is controversial,
because it leads to duplicate code, but keeping the indicator
definitions inline is clearly faster. This is not seen as a huge
problem for the Default style, because the indicator is not too
complicated. Basically, this fixes a ~5% performance regression
introduced by 1acb34a.
Before:
running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml
[...]
Average: 72.8 frames; using samples; MedianAll=73; StdDev=1.48324, CoV=0.0203742
After:
running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml
[...]
Average: 77 frames; using samples; MedianAll=77; StdDev=1.41421, CoV=0.0183664
Change-Id: Ibee0e29e83a64ee4a6a772a90b1784a9c8c715bb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add an internal CheckLabel helper that simply initializes a few
QQuickText properties with defaults that are suitable for CheckBox,
Switch, and RadioButton. This gives a 10% boost on desktop in debug
mode, and a 5% boost on a TX1 in release mode.
Change-Id: I82fead9ca22b6aa74f24924d240c924b2a42a912
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/imports/controls/MenuItem.qml
Change-Id: Id4cae0e53a58796694ad1fc9f8380b317ee62984
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The size (and position) of the background item is respected if
explicitly defined, so the wrapper item is not needed. This does
not reduce or simplify bindings, so the performance boost is not
remarkable, but this can improve the qmlbench results by a frame
or two depending on the hardware. ;)
Change-Id: Ibd45cf02a3eb30b48b4af86e369a1db4cc5d3864
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Unfortunately we need to manually add some \sa "palette QML Basic Type"
links as a workaround until auto-linking to basic QML types in QML
property headers is fixed in QDoc.
Task-number: QTBUG-63469
Change-Id: I2ea853bfeda31905468741eb720f4daa242e703d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Squeeze a few more frames in qmlbench by getting rid of one extra Item
and optimizing the bindings.
Before:
running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_switch.qml
[...]
Average: 94.4 frames; using samples; MedianAll=94; StdDev=1.14018, CoV=0.0120781
After:
running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_switch.qml
[...]
Average: 98.8 frames; using samples; MedianAll=99; StdDev=1.09545, CoV=0.0110875
Change-Id: I37bc9c7e75ec1620b6f575aa4aa97961367f79fd
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
File system lookups are somewhat expensive, so cache the results to
avoid repetitive lookups. The default cache size of 500 is a rough
estimate based on that the default assets have 300+ images per scale
factor.
Caching image lookups gives an average of 20% performance improvement
in qmlbench:
control before after improvement
----------------------------------------------
busyindicator 29 32 1.10344827586207
button 53 60 1.13207547169811
checkbox 51 60 1.17647058823529
combobox 39 44 1.12820512820513
dial 110 147 1.33636363636364
itemdelegate 54 61 1.12962962962963
label 143 152 1.06293706293706
menuitem 26 34 1.30769230769231
progressbar 13 15 1.15384615384615
radiobutton 52 59 1.13461538461538
scrollbar 37 62 1.67567567567568
scrollview 78 121 1.55128205128205
slider 31 40 1.29032258064516
spinbox 75 85 1.13333333333333
switch 35 43 1.22857142857143
textarea 80 88 1.1
textfield 56 63 1.125
tumbler 126 128 1.01587301587302
----------------------------------------------
average 1.2102967624703
Caching can be disabled by setting an environment variable:
QT_QUICK_CONTROLS_IMAGINE_CACHE=0
but this is not advertised in the docs for the time being. It is
there to help debugging, should anything go wrong with caching.
Change-Id: I1119f3d8186bc9a51cc174b06fed02ed9e1fb70c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ie5b9a513baa70e88ade9cc4980b81fe6a363edf6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- other controls (textfield, combobox, ...) will eventually gain support
for icons too
- advertise icon support on the index page amongst other important topics
- document the steps for building an icon theme with high-dpi support
Change-Id: I35ed76ef005d7e273beb5f5147ca92849adc0d90
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I9188f94e40e2ecb4da1963ce2fcf915ab7a4b4fb
|
| |
| |
| |
| |
| | |
Change-Id: Ifbbc0695023d238f2066f3412e563fb663cdec74
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
qtquickcontrols2-customize.qdoc:558: warning:
Command '\skipto' failed at end of file 'qtquickcontrols2-menu-custom.qml'
qtquickcontrols2-customize.qdoc:573: warning:
Command '\skipto' failed at end of file 'qtquickcontrols2-menubar-custom.qml'
Change-Id: Ica50d42e53522bdcb31fbc38f870856aa036f549
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
These assets were removed in cd7aae.
Task-number: QTBUG-63895
Change-Id: I6f7c6d179723191708403f90f99e5c11b9f84fa7
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
This plugin crops upscaled 9-patch PNG assets when exported from Sketch,
to ensure that 9-patch borders remain 1px wide when upscaled.
Change-Id: Iad46d75f37b76eecf64ac32fa38d2b9e9db8b34d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
From now on, the assets are maintained via imagine.sketch. ;)
Change-Id: Icee606115cb149f3c99b8d9b768ccb080ad909be
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- remove @1x from
- applicationwindow-overlay-modal
- menuitem-arrow-disabled
- rename
- button-background-disabled-checked -> button-background-checked-disabled
- add missing
- combobox-background-editable-focused
- combobox-background-focused
- dial-handle-hovered
- delaybutton-background-focused
- drawer-overlay
- drawer-overlay-modal
- remove checkable states for button
Now the exported assets match with the files generated by imaginator.
Change-Id: Icc73cd526227150b344512d08027f772a53acac2
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
For example:
assets/
|__ button-background.9.png
|__ +custom/
|__ button-background.9.png
$ QT_FILE_SELECTORS=custom ./myapp
Change-Id: I26f0b82885aa1a8e62fb4e3e58c7d8b19012406e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The output helps to debug image asset selection. For example:
qt.quick.controls.imagine: "button-background" () -> "path/to/button-background.9.png"
qt.quick.controls.imagine: "button-background" ("hovered") -> "path/to/button-background-hovered.9.png"
Change-Id: I3aee85d357d9b9436341bfb06486e5b3089ce86f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- flat buttons don't need checkable assets (checkable-checked vs.
checked, and checkable-highlighted vs. highlighted look identical)
- delegates don't need a checked background, because the checked
state is visualized by the indicator
- text editors have no pressed state
- mirrored page-indicator is unnecessary because it looks identical
(if a mirrored version was needed, then we would need to provide
mirrored versions of all states including pressed, current...)
Change-Id: I909f639bdcf9d9653c56b8ce2eda49b3219bdf77
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
src/quicktemplates2/qquickbuttongroup.cpp
src/quicktemplates2/qquickoverlay.cpp
tests/auto/controls/data/tst_buttongroup.qml
Change-Id: Iae23aaf039c6095007966475294e93220dbead84
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63618
Change-Id: I6a32158726e4425dc24c24f4f9dc9cc80aa462bf
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I859b61880da16f6c58967700b179f35df656ed77
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- split to page per control
- define a palette and used shared styles
- use shared symbols for 9-patches, indicators, handles, etc.
- minor geometrical fixes here and there
Change-Id: Ib6992f5ce2f57193ac893684bed43f039f22a815
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Apparently the environment variable is not resolved on Windows
platform, leading to documentation build failure.
Task-number: QTBUG-63626
Change-Id: Ia37a3f7f35007f6756f1b99422d7d6b70b9ae10f
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I61f56c8806f02da2cab2ecf8452598431d921ca6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Iac93ca277883984ef99ffc34acade32f7b4ce434
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Changes:
- fix content padding for delegates
- fix switch indicator size
- fix combobox content padding
- fix groupbox content padding
- fix progressbar
- fix delaybutton radius
- fix popup overlay
- fix dial background
- fix tooltip content padding
- fix combobox
- fix popups
- fix appwindow background
- fix itemdelegate-background colors
- fix radiodelegate-background
- fix pane padding
- fix radiodelegate-indicator-pressed color
- fix pageindicator
- fix sliders and range sliders
- fix scrollbar & indicator
- fix slider progress color
- fix spinbox
- fix switch
- fix tabs
- fix textfield padding
- fix toolbar, button, separator
- fix drawer
- fix partially checked checkbox indicator
- fix checkbox pressed indicator color
- fix checkbox & delegate checkmark
- fix dial handle size
- fix dialogbuttonbox padding
Change-Id: Idbbed7c7f80c754b3852b49e0720a02fbecfca49
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
These were incorrectly generated and are not used.
Change-Id: Iec5fbdbaccce96722fa9ff1adefd43ecbcc4aebb
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: I2b31b35d61c61b37234c7da4ace75c4645bc076a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|