| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
src/quicktemplates2/qquickbuttongroup.cpp
src/quicktemplates2/qquickoverlay.cpp
tests/auto/controls/data/tst_buttongroup.qml
Change-Id: Iae23aaf039c6095007966475294e93220dbead84
|
| |
| |
| |
| |
| | |
Change-Id: I6b9e31919502fb2f47e4b3657302a745c9f85b23
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Avoid accidental detach with C++11 range for loops.
Change-Id: I2a105ef5a2505d26ee086974177f8f1e4040b522
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: I68270893bd7b56585095661b1cda21a28893c631
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| | |
Change-Id: I4ffcdbc519bd3e997552b5f4c1c81e01d5b1185c
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: I7d4b1f7f0ad0426a79b41534030b65774cd1b07f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: I1dfccfc2066c6346d7bd5e60105230446e047183
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: I54826f9d76a8789ffc36dd2f613648c5553103e0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: Id649730f22b43d37a5ea8ff28bec22293356e4d1
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: I92e9c33c3d98f863f6de3764a9796e8aa7a61a4f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: Ife154914e49dd7946046984c61b22b551f6f7817
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: Ie25329442763920b905c857c275472abaff9957c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: I7b8037c52892d8dfb4a38450c58101353d9d2d1f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: I1f830dbfa2a723950fe0d10912fa459ab9968517
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: I61cc75166df05933782c24109e845411ef2aff0b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: Ic9e516f656d4115a0546f12e1fde46d4932c2901
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: I9b4535dbd6279314bb51b08a094bfb72054c9c2a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: Iced34279af95caa62f097694c94c2ec34285f748
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: I371fbcdfe0cbea9e668d82912d6d7b5ed554542b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: I4d9f50e324aba922061cdbedeea953f127270f32
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: I37c1f4298fa01b907dfcb28757cd5d7ded182192
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: I14cdbef627c4c689d6e0009de1d5dc04515c9c17
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: Iabdb22852f319c1c7370b724f806523fcb1f1b91
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: Idc56f58f482610f3f745576b82d497d8e6dc19f1
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: I545b267cb69b4fd76e42c17d436362ee4e06c45a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: Icf2204f9395798ccdca2448a26e0a2c9c4826a33
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63369
Change-Id: If752fc3c29aa01993d3803364814c5a9962a3657
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
It had some unrelated junk at the top.
Change-Id: Ie6c394d3e8355e6117339d646e6384336b735bdc
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I5d8a68d44dcfd1e3ed92361cc4706557ae253e3a
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ic596a7c237392e1a54591ac82b0b78ac806acf16
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63331
Change-Id: I5dbabc0c0a986761ce77b37c791e7a8fdd1034e2
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-63331
Change-Id: I42232ab2dc270b5a68bcf967517b2a00d3aad666
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|