From 1f26b91740807f6a8c9d480bcb0d63ea2e0c10d6 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Wed, 31 May 2017 10:59:04 +0200 Subject: Doc: improve margin documentation - Add margins to the Popup Layout diagram. - For each margin property, mention that margins are the distance between the popup edge and the window edge. - Link to Popup Layout from each margin property. Change-Id: I8226ea341f6825b7cfe67e1427ce853671e5a54e Reviewed-by: J-P Nurmi --- .../controls/doc/images/qtquickcontrols2-popup.png | Bin 21693 -> 30328 bytes .../controls/doc/images/qtquickcontrols2-popup.svg | 560 +++++++++++++++------ 2 files changed, 420 insertions(+), 140 deletions(-) (limited to 'src/imports/controls/doc/images') diff --git a/src/imports/controls/doc/images/qtquickcontrols2-popup.png b/src/imports/controls/doc/images/qtquickcontrols2-popup.png index 4514948d..a0bc3d8c 100644 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-popup.png and b/src/imports/controls/doc/images/qtquickcontrols2-popup.png differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-popup.svg b/src/imports/controls/doc/images/qtquickcontrols2-popup.svg index 1d78addf..91bde0c5 100644 --- a/src/imports/controls/doc/images/qtquickcontrols2-popup.svg +++ b/src/imports/controls/doc/images/qtquickcontrols2-popup.svg @@ -9,12 +9,12 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="679.31317" - height="357.84125" - viewBox="0 0 679.31314 357.84124" + width="817.22076" + height="605.42444" + viewBox="0 0 766.14443 567.58541" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.1 r15371" sodipodi:docname="qtquickcontrols2-popup.svg" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> @@ -30,9 +30,9 @@ inkscape:isstock="true"> @@ -77,7 +77,7 @@ id="path4212" style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="scale(-0.6,-0.6)" + transform="scale(-0.6)" inkscape:connector-curvature="0" /> + d="M 5.77,0 -2.88,5 V -5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="scale(-0.8)" /> + d="M 5.77,0 -2.88,5 V -5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="scale(0.8)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -202,7 +352,7 @@ image/svg+xml - + @@ -210,19 +360,19 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(91.482322,-255.11685)"> + transform="translate(117.89629,-192.1482)"> + width="564.20264" + height="365.80341" + x="-21.075951" + y="321.69159" /> Background Background + width="432.17508" + height="243.95665" + x="44.027798" + y="384.97104" /> Content item - + style="font-size:37.45019655px;fill:#000000;" />Content item + + Available height + + + Available height Available width Width - + style="font-size:17.5px;line-height:1.25;fill:#000000" + id="flowPara10048">Available width + Width + + + + Height Height Popup Popup Bottom padding Top padding Right padding Left padding + id="flowPara4386-0">Left padding + Window + + Bottom margin + + + Top margin + + + Right margin + + Left margin -- cgit v1.2.3