X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flayout.h;h=2bddb77cfa30bef43632036b8e2564e41e59a06e;hb=7a0f255ecf23391f09488ac54fb9b1124827dfa7;hp=43d1ca875c2d01d9e9a60e9e22e554808b43d673;hpb=a7776a50f9c3bf8d3a61af56f6d11b0721209582;p=libs%2Fgltk.git diff --git a/source/layout.h b/source/layout.h index 43d1ca8..2bddb77 100644 --- a/source/layout.h +++ b/source/layout.h @@ -61,7 +61,8 @@ private: TARGET_POS = 8, TARGET_DIM = 16, TARGET_MASK = 24, - SPACING = 32 + SPACING = 32, + SLACK = 64 }; public: @@ -71,6 +72,10 @@ public: BELOW = VERTICAL|SELF_POS|SELF_DIM|TARGET_POS|SPACING, RIGHT_OF = HORIZONTAL|SELF_POS|TARGET_POS|TARGET_DIM|SPACING, LEFT_OF = HORIZONTAL|SELF_POS|SELF_DIM|TARGET_POS|SPACING, + FAR_ABOVE = VERTICAL|SELF_POS|TARGET_POS|TARGET_DIM|SPACING|SLACK, + FAR_BELOW = VERTICAL|SELF_POS|SELF_DIM|TARGET_POS|SPACING|SLACK, + FAR_RIGHT_OF = HORIZONTAL|SELF_POS|TARGET_POS|TARGET_DIM|SPACING|SLACK, + FAR_LEFT_OF = HORIZONTAL|SELF_POS|SELF_DIM|TARGET_POS|SPACING|SLACK, ALIGN_TOP = VERTICAL|SELF_POS|SELF_DIM|TARGET_POS|TARGET_DIM, ALIGN_BOTTOM = VERTICAL|SELF_POS|TARGET_POS, ALIGN_RIGHT = HORIZONTAL|SELF_POS|SELF_DIM|TARGET_POS|TARGET_DIM, @@ -129,6 +134,7 @@ protected: Container *container; std::list slots; unsigned n_active_slots; + unsigned n_slack_constraints[2]; Sides margin; unsigned row_spacing; unsigned col_spacing;