Floats documentation.

3 files changed, 44 insertions, 15 deletions

diff --git a/doc/dw-grows.doc b/doc/dw-grows.doc
new file mode 100644
index 00000000..669e46f5
--- /dev/null
+++ b/doc/dw-grows.doc
@@ -0,0 +1,5 @@
+/** \page dw-grows GROWS - Grand Redesign Of Widget Sizes
+
+...
+
+*/
\ No newline at end of file
diff --git a/doc/dw-out-of-flow-2.doc b/doc/dw-out-of-flow-2.doc
index de15c672..d9d70565 100644
--- a/doc/dw-out-of-flow-2.doc
+++ b/doc/dw-out-of-flow-2.doc
@@ -1,7 +1,6 @@
-/** \page dw-out-of-flow-2 Handling Elements Out Of Flow (cont.)
+/** \page dw-out-of-flow-2 Handling Elements Out Of Flow (notes 2)
 
-(Some notes, to be integrated into \ref dw-out-of-flow; focus mainly
-on performance aspects.)
+This has to be integrated into \ref dw-out-of-flow.
 
 Constructing a page with floats
 -------------------------------
diff --git a/doc/dw-out-of-flow.doc b/doc/dw-out-of-flow.doc
index 16523952..88dd4d72 100644
--- a/doc/dw-out-of-flow.doc
+++ b/doc/dw-out-of-flow.doc
@@ -1,14 +1,13 @@
 /** \page dw-out-of-flow Handling Elements Out Of Flow
 
-<div style="border: 2px solid #ff4040; margin-bottom: 0.5em;
-padding: 0.5em 1em; background-color: #fff0f0"><b>Info:</b>
-Incomplete; some parts have been removed, beause they are not up to
-date.</div>
 
 <div style="border: 2px solid #ffff00; margin-bottom: 0.5em;
 padding: 0.5em 1em; background-color: #ffffe0"><b>Info:</b>
 Should be incorporated into dw::Textblock.</div>
 
+Introduction
+============
+
 This texts deals with both floats and absolute positions, which have
 in common that there is a distinction between generating block and
 containing block (we are here using the same notation as in the
@@ -47,9 +46,12 @@ their borders, and so their size. In this example, the following list
 item (green) must consider the position of the float. This is
 discussed in detail in the next section.)
 
+Both in this text and the code, generating and containing block are
+abbreviated with **GB** and **CB**, respectively.
 
-Implication for size calculations and allocation
-================================================
+
+The sizeRequest/sizeAllocate problem
+========================================
 
 *See also:* \ref dw-widget-sizes, especially the section *Rules for
 Methods Related to Resizing*.
@@ -91,13 +93,16 @@ to calculate the borders. The position, however, is stored in the
 allocation, which is typically calculated later.
 
 Here, two cases must be distinguished. The position of a float is
-always relative to its generating block, so for calculating the
+always **relative to its generating block**, so for calculating the
 borders for the generating block, the allocation needs not to be
 know. For other textblocks, it needs to be known, so the calculation
 of the borders will ignore floats generated by other textblocks, until
 all widgets are allocated. The latter will call (when neccessary)
 dw::core::Widget::queueResize, so that all border calculations are
-repeated.
+repeated. See below (*hasRelationChanged*) for details.
+
+Generally, this pattern (distinguishing between GB and CB) can be
+found everywhere in dw::OutOfFlowMgr.
 
 For details see:
 
@@ -109,12 +114,19 @@ For details see:
   dw::OutOfFlowMgr::sizeAllocateEnd which are called by the containing
   block.
 
+(This could be solved in a more simple, elegant way, when
+*sizeRequest* would depend on the position. This is, however, only a
+vague idea, perhaps not even feasible, and for which there are no
+concrete plans, certainly not in \ref dw-grows.)
+
+
 Implementation overview
 =======================
 
 <div style="border: 2px solid #ff4040; margin-bottom: 0.5em;
 padding: 0.5em 1em; background-color: #fff0f0"><b>Warning:</b>
-This complete section must be reviewed.</div>
+This complete section must be reviewed. Also, integrate \ref
+dw-out-of-flow (most probably into this section).</div>
 
 Widget level
 ------------
@@ -177,9 +189,22 @@ introduced. Details are hidden by static inline methods of
 dw::OutOfFlowMgr.
 
 
-See also
-========
+How *hasRelationChanged* works
+==============================
+
+...
+
+
+Integration of line breaking and floats
+=======================================
+
+(Positioning of floats, loop, recent works.)
+
+
+Absolute and fixed positiones
+=============================
+
+...
 
-\ref dw-out-of-flow-2
 
 */
\ No newline at end of file