diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2010-04-09 22:18:05 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2010-04-09 22:18:05 +0000 |
| commit | 927fd351655320ed90ceecedaf9ea58656594650 (patch) | |
| tree | a9698d39716b54a81c88e5e2aa10656c062501ae /FL | |
| parent | 08e71113e9b071be540c0ecb03287e647c0bc0c5 (diff) | |
Added new label alignments for image and text to Fluid.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7476 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Enumerations.H | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H index b2e5aa367..4a0a8eef3 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -658,17 +658,17 @@ const Fl_Align FL_ALIGN_RIGHT = (Fl_Align)8; /** Draw the label inside of the widget. */ const Fl_Align FL_ALIGN_INSIDE = (Fl_Align)16; /** If the label contains an image, draw the text on top of the image. */ -const Fl_Align FL_ALIGN_TEXT_OVER_IMAGE = (Fl_Align)32; +const Fl_Align FL_ALIGN_TEXT_OVER_IMAGE = (Fl_Align)0x0020; /** If the label contains an image, draw the text below the image. */ -const Fl_Align FL_ALIGN_IMAGE_OVER_TEXT = (Fl_Align)0; +const Fl_Align FL_ALIGN_IMAGE_OVER_TEXT = (Fl_Align)0x0000; /** All parts of the label that are lager than the widget will not be drawn . */ const Fl_Align FL_ALIGN_CLIP = (Fl_Align)64; /** Wrap text that does not fit the width of the widget. */ const Fl_Align FL_ALIGN_WRAP = (Fl_Align)128; - /** If the label contains an image, draw the text to the left of the image. */ -const Fl_Align FL_ALIGN_TEXT_NEXT_TO_IMAGE = (Fl_Align)0x0100; /** If the label contains an image, draw the text to the right of the image. */ -const Fl_Align FL_ALIGN_IMAGE_NEXT_TO_TEXT = (Fl_Align)0x0110; +const Fl_Align FL_ALIGN_IMAGE_NEXT_TO_TEXT = (Fl_Align)0x0100; + /** If the label contains an image, draw the text to the left of the image. */ +const Fl_Align FL_ALIGN_TEXT_NEXT_TO_IMAGE = (Fl_Align)0x0120; /** If the label contains an image, draw the image or deimage in the backgroup. */ const Fl_Align FL_ALIGN_IMAGE_BACKDROP = (Fl_Align)0x0200; const Fl_Align FL_ALIGN_TOP_LEFT = FL_ALIGN_TOP | FL_ALIGN_LEFT; @@ -680,6 +680,8 @@ const Fl_Align FL_ALIGN_RIGHT_TOP = 0x000b; // magic value const Fl_Align FL_ALIGN_LEFT_BOTTOM = 0x000d; // magic value const Fl_Align FL_ALIGN_RIGHT_BOTTOM = 0x000e; // magic value const Fl_Align FL_ALIGN_NOWRAP = (Fl_Align)0; // for back compatability +const Fl_Align FL_ALIGN_POSITION_MASK = 0x000f; // left, right, top, bottom +const Fl_Align FL_ALIGN_IMAGE_MASK = 0x0320; // l/r, t/b, backdrop /*@}*/ |