From e1b1191e8df727f546bdbbb7da6b14e897c70e7c Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 22 Sep 2016 13:44:52 +0200 Subject: Popup: fix some of the documentation review findings Change-Id: I69b60faab1588a45e005ba721c9796680bad6ac1 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi --- .../doc/src/includes/qquickpopup-padding.qdocinc | 10 ++++++++++ .../controls/doc/src/qtquickcontrols2-customize.qdoc | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 src/imports/controls/doc/src/includes/qquickpopup-padding.qdocinc (limited to 'src/imports/controls/doc/src') diff --git a/src/imports/controls/doc/src/includes/qquickpopup-padding.qdocinc b/src/imports/controls/doc/src/includes/qquickpopup-padding.qdocinc new file mode 100644 index 00000000..31f5d2db --- /dev/null +++ b/src/imports/controls/doc/src/includes/qquickpopup-padding.qdocinc @@ -0,0 +1,10 @@ +//! [padding] + +The padding properties are used to control the geometry of the +\l {contentItem}{content item}. + +Popup uses the same approach to padding as \l {Control::padding}{Control}. +For a visual explanation of the padding system, see the \l {Control Layout} +section of the documentation. + +//! [padding] diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc index 559c89f0..852a1e03 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc @@ -489,6 +489,24 @@ \snippet qtquickcontrols2-pane-custom.qml file + \section2 Customizing Popup + + Popup consists of a \l {Popup::background}{background} and + \l {Popup::contentItem}{content item}. + + \image qtquickcontrols2-popup-custom.png + + \quotefromfile qtquickcontrols2-popup-custom.qml + \skipto import QtQuick 2.6 + \printuntil import QtQuick.Controls 2.0 + \codeline + \skipto Popup + \printuntil { + \printuntil } + \printuntil } + \printuntil } + + \section2 Customizing ProgressBar ProgressBar consists of two visual items: \l {Control::background}{background} -- cgit v1.2.3