aboutsummaryrefslogtreecommitdiffstats
path: root/src/controls/doc
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-06-16 14:44:32 +0200
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-06-16 22:35:14 +0000
commit21697e9df962339dc4b1b40c3d3c46ae65790881 (patch)
treee8ff314b8d1a6a9b215cabde4f3f143e86b8168f /src/controls/doc
parent6a2d7ea011424d77c892229dae4756a8e7a90a88 (diff)
Docs: TextField
Change-Id: I892ca73cdc1d96d924b369b30d822b3dd7611c94 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls/doc')
-rw-r--r--src/controls/doc/images/qtquickcontrols2-textfield-background.pngbin0 -> 1540 bytes
-rw-r--r--src/controls/doc/images/qtquickcontrols2-textfield-disabled.pngbin0 -> 1428 bytes
-rw-r--r--src/controls/doc/images/qtquickcontrols2-textfield-focused.pngbin0 -> 1587 bytes
-rw-r--r--src/controls/doc/images/qtquickcontrols2-textfield-normal.pngbin0 -> 1261 bytes
-rw-r--r--src/controls/doc/images/qtquickcontrols2-textfield-placeholder.pngbin0 -> 1588 bytes
-rw-r--r--src/controls/doc/src/qtquickcontrols2-customize.qdoc18
6 files changed, 18 insertions, 0 deletions
diff --git a/src/controls/doc/images/qtquickcontrols2-textfield-background.png b/src/controls/doc/images/qtquickcontrols2-textfield-background.png
new file mode 100644
index 00000000..a2908200
--- /dev/null
+++ b/src/controls/doc/images/qtquickcontrols2-textfield-background.png
Binary files differ
diff --git a/src/controls/doc/images/qtquickcontrols2-textfield-disabled.png b/src/controls/doc/images/qtquickcontrols2-textfield-disabled.png
new file mode 100644
index 00000000..bb5b779e
--- /dev/null
+++ b/src/controls/doc/images/qtquickcontrols2-textfield-disabled.png
Binary files differ
diff --git a/src/controls/doc/images/qtquickcontrols2-textfield-focused.png b/src/controls/doc/images/qtquickcontrols2-textfield-focused.png
new file mode 100644
index 00000000..5d8592c1
--- /dev/null
+++ b/src/controls/doc/images/qtquickcontrols2-textfield-focused.png
Binary files differ
diff --git a/src/controls/doc/images/qtquickcontrols2-textfield-normal.png b/src/controls/doc/images/qtquickcontrols2-textfield-normal.png
new file mode 100644
index 00000000..26ad9c11
--- /dev/null
+++ b/src/controls/doc/images/qtquickcontrols2-textfield-normal.png
Binary files differ
diff --git a/src/controls/doc/images/qtquickcontrols2-textfield-placeholder.png b/src/controls/doc/images/qtquickcontrols2-textfield-placeholder.png
new file mode 100644
index 00000000..b040315f
--- /dev/null
+++ b/src/controls/doc/images/qtquickcontrols2-textfield-placeholder.png
Binary files differ
diff --git a/src/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/controls/doc/src/qtquickcontrols2-customize.qdoc
index a89c8d69..be6fc368 100644
--- a/src/controls/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/controls/doc/src/qtquickcontrols2-customize.qdoc
@@ -168,6 +168,24 @@
\snippet Switch.qml indicator
+ \section1 Customizing TextField
+
+ TextField consists of two parts: \l {TextField::background}{background}
+ and \l {TextField::placeholder}{placeholder}. Their implicit sizes are
+ used to calculate the implicit size of the control.
+
+ \section3 Background
+
+ \image qtquickcontrols2-textfield-background.png
+
+ \snippet TextField.qml background
+
+ \section3 Placeholder
+
+ \image qtquickcontrols2-textfield-placeholder.png
+
+ \snippet TextField.qml placeholder
+
\section1 Customizing ToggleButton
ToggleButton consists of three parts: \l {Control::background}{background},