Completed the alignment pulldown menus for all new alignment styles. Hope you guys like it.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7478 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 119 insertions, 35 deletions

diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl
index 3480fe35f..e20cac500 100644
--- a/fluid/widget_panel.fl
+++ b/fluid/widget_panel.fl
@@ -102,68 +102,152 @@ Use Ctrl-J for newlines.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 1 te
             label Clip
             user_data FL_ALIGN_CLIP
             callback align_cb
-            tooltip {Clip the label to the inside of the widget.} xywh {95 115 40 20} type Toggle selection_color 8 labelsize 11 align 16
+            tooltip {Clip the label to the inside of the widget.} xywh {95 115 30 20} type Toggle selection_color 8 labelsize 11 align 16
           }
           Fl_Button {} {
             label Wrap
             user_data FL_ALIGN_WRAP
             callback align_cb
-            tooltip {Wrap the label text.} xywh {140 115 40 20} type Toggle selection_color 8 labelsize 11
+            tooltip {Wrap the label text.} xywh {130 115 30 20} type Toggle selection_color 8 labelsize 11
           }
-          Fl_Menu_Button {} {
-            label {Text/Image}
-            callback align_text_image_cb open
-            xywh {185 115 80 20} labelsize 11 align 20
+          Fl_Button {} {
+            label {@-1<-}
+            user_data FL_ALIGN_LEFT
+            callback align_cb
+            tooltip {Left-align the label.} xywh {270 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 hide
+          }
+          Fl_Button {} {
+            label {@-1->}
+            user_data FL_ALIGN_RIGHT
+            callback align_cb
+            tooltip {Right-align the label.} xywh {295 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 hide
+          }
+          Fl_Button {} {
+            label {@-18}
+            user_data FL_ALIGN_TOP
+            callback align_cb
+            tooltip {Top-align the label.} xywh {320 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 hide
+          }
+          Fl_Button {} {
+            label {@-12}
+            user_data FL_ALIGN_BOTTOM
+            callback align_cb
+            tooltip {Bottom-align the label.} xywh {345 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 hide
+          }
+          Fl_Choice {} {
+            callback align_text_image_cb open selected
+            xywh {165 115 110 20} down_box BORDER_BOX labelsize 11 textsize 11
           } {
             MenuItem {} {
+              label {   Image Alignment   }
+              user_data 0xFFFFFFFF
+              xywh {145 145 100 20} labelfont 2 labelsize 11 deactivate
+            }
+            MenuItem {} {
               label {image over text}
               user_data FL_ALIGN_IMAGE_OVER_TEXT
-              xywh {10 10 100 20} type Radio labelsize 11
+              xywh {25 25 100 20} labelsize 11
             }
             MenuItem {} {
               label {text over image}
-              user_data FL_ALIGN_TEXT_OVER_IMAGE selected
-              xywh {0 0 100 20} type Radio labelsize 11
+              user_data FL_ALIGN_TEXT_OVER_IMAGE
+              xywh {15 15 100 20} labelsize 11
             }
             MenuItem {} {
               label {text next to image}
               user_data FL_ALIGN_TEXT_NEXT_TO_IMAGE
-              xywh {20 20 100 20} type Radio labelsize 11
+              xywh {35 35 100 20} labelsize 11
             }
             MenuItem {} {
               label {image next to text}
               user_data FL_ALIGN_IMAGE_NEXT_TO_TEXT
-              xywh {30 30 100 20} type Radio labelsize 11
+              xywh {45 45 100 20} labelsize 11
             }
             MenuItem {} {
               label {image is backdrop}
               user_data FL_ALIGN_IMAGE_BACKDROP
-              xywh {40 40 100 20} type Radio labelsize 11
+              xywh {55 55 100 20} labelsize 11
             }
           }
-          Fl_Button {} {
-            label {@-1<-}
-            user_data FL_ALIGN_LEFT
-            callback align_cb
-            tooltip {Left-align the label.} xywh {270 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8
-          }
-          Fl_Button {} {
-            label {@-1->}
-            user_data FL_ALIGN_RIGHT
-            callback align_cb
-            tooltip {Right-align the label.} xywh {295 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8
-          }
-          Fl_Button {} {
-            label {@-18}
-            user_data FL_ALIGN_TOP
-            callback align_cb
-            tooltip {Top-align the label.} xywh {320 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8
-          }
-          Fl_Button {} {
-            label {@-12}
-            user_data FL_ALIGN_BOTTOM
-            callback align_cb
-            tooltip {Bottom-align the label.} xywh {345 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8
+          Fl_Choice {} {
+            callback align_position_cb open
+            xywh {280 115 85 20} down_box BORDER_BOX labelsize 11 textsize 11
+          } {
+            MenuItem {} {
+              label {   Inside && Outside   }
+              user_data 0xFFFFFFFF
+              xywh {135 135 100 20} labelfont 2 labelsize 11 deactivate
+            }
+            MenuItem {} {
+              label {top left}
+              user_data FL_ALIGN_TOP_LEFT
+              xywh {45 45 100 20} labelsize 11
+            }
+            MenuItem {} {
+              label top
+              user_data FL_ALIGN_TOP
+              xywh {55 55 100 20} labelsize 11
+            }
+            MenuItem {} {
+              label {top right}
+              user_data FL_ALIGN_TOP_RIGHT
+              xywh {65 65 100 20} labelsize 11
+            }
+            MenuItem {} {
+              label left
+              user_data FL_ALIGN_LEFT
+              xywh {75 75 100 20} labelsize 11
+            }
+            MenuItem {} {
+              label center
+              user_data FL_ALIGN_CENTER
+              xywh {35 35 100 20} labelsize 11
+            }
+            MenuItem {} {
+              label right
+              user_data FL_ALIGN_RIGHT
+              xywh {85 85 100 20} labelsize 11
+            }
+            MenuItem {} {
+              label {bottom left}
+              user_data FL_ALIGN_BOTTOM_LEFT
+              xywh {95 95 100 20} labelsize 11
+            }
+            MenuItem {} {
+              label bottom
+              user_data FL_ALIGN_BOTTOM
+              xywh {105 105 100 20} labelsize 11
+            }
+            MenuItem {} {
+              label {bottom right}
+              user_data FL_ALIGN_BOTTOM_RIGHT
+              xywh {115 115 100 20} labelsize 11 divider
+            }
+            MenuItem {} {
+              label {   Outside Alignment   }
+              user_data 0xFFFFFFFF
+              xywh {125 125 100 20} labelfont 2 labelsize 11 deactivate
+            }
+            MenuItem {} {
+              label {left top}
+              user_data FL_ALIGN_LEFT_TOP
+              xywh {135 135 100 20} labelsize 11
+            }
+            MenuItem {} {
+              label {right top}
+              user_data FL_ALIGN_RIGHT_TOP
+              xywh {145 145 100 20} labelsize 11
+            }
+            MenuItem {} {
+              label {left bottom}
+              user_data FL_ALIGN_LEFT_BOTTOM
+              xywh {155 155 100 20} labelsize 11
+            }
+            MenuItem {} {
+              label {right bottom}
+              user_data FL_ALIGN_RIGHT_BOTTOM
+              xywh {45 45 100 20} labelsize 11
+            }
           }
           Fl_Button {} {
             label {@-3square}