Improve test/tabs demo - enlarge window, shift widgets around.

This is a layout update only. The window has been enlarged, and some of
the text widgets as well so the labels fit better, depending on fonts.


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

1 files changed, 60 insertions, 60 deletions

diff --git a/test/tabs.fl b/test/tabs.fl
index ac3d51f0f..37ff4b0a9 100644
--- a/test/tabs.fl
+++ b/test/tabs.fl
@@ -6,36 +6,36 @@ Function {} {open
 } {
   Fl_Window foo_window {
     label {Comparison of Fl_Tab (left) vs. Fl_Wizard (right)} open
-    xywh {423 205 642 337} type Double hide resizable
+    xywh {516 38 660 400} type Double hide resizable
   } {
     Fl_Box {} {
       label {class Fl_Tabs}
       xywh {95 0 130 35} labeltype ENGRAVED_LABEL labelfont 1
     }
-    Fl_Tabs {} {
-      tooltip {the various index cards test different aspects of the Fl_Tabs widget} xywh {10 35 300 205} selection_color 4 labelcolor 7 resizable
+    Fl_Tabs {} {open selected
+      tooltip {the various index cards test different aspects of the Fl_Tabs widget} xywh {10 35 315 260} selection_color 4 labelcolor 7 resizable
     } {
       Fl_Group {} {
-        label {Label&1} open selected
-        tooltip {this Tab tests correct keyboard navigation between text input fields} xywh {10 60 300 180} selection_color 1 resizable
+        label {Label&1}
+        tooltip {this Tab tests correct keyboard navigation between text input fields} xywh {10 60 315 235} selection_color 1 resizable
       } {
         Fl_Input {} {
           label {input:}
-          tooltip {This is the first input field} xywh {60 80 240 40}
+          tooltip {This is the first input field} xywh {70 80 240 40}
         }
         Fl_Input {} {
           label {input2:}
-          xywh {60 120 240 30}
+          xywh {70 120 240 30}
           code0 {o->tooltip("");}
         }
         Fl_Input {} {
           label {input3:}
-          xywh {60 150 240 80}
+          xywh {70 150 240 80}
         }
       }
       Fl_Group {} {
         label {tab&2} open
-        tooltip {tab2 tests among other things the cooperation of modal windows and tabs} xywh {10 60 300 180} selection_color 2 hide
+        tooltip {tab2 tests among other things the cooperation of modal windows and tabs} xywh {10 60 315 235} selection_color 2 hide
       } {
         Fl_Button {} {
           label button1
@@ -50,76 +50,76 @@ Function {} {open
         }
         Fl_Button {} {
           label {This is stuff inside the Fl_Group "tab2"}
-          xywh {30 170 260 30}
+          xywh {25 170 275 30}
         }
         Fl_Button {} {
           label {Test event blocking by modal window}
           callback {fl_message("Make sure you cannot change the tabs while this modal window is up");}
-          xywh {30 200 260 30}
+          xywh {25 200 275 30}
           code0 {\#include <FL/fl_ask.H>}
         }
       }
       Fl_Group {} {
         label {tab&3} open
-        tooltip {tab3 checks for correct keyboard navigation} xywh {10 60 300 180} selection_color 3 hide
+        tooltip {tab3 checks for correct keyboard navigation} xywh {10 60 315 235} selection_color 3 hide
       } {
         Fl_Button {} {
           label button2
-          xywh {20 90 60 80}
+          xywh {20 65 60 80}
         }
         Fl_Button {} {
           label button
-          xywh {80 90 60 80}
+          xywh {80 65 60 80}
         }
         Fl_Button {} {
           label button
-          xywh {140 90 60 80}
+          xywh {140 65 60 80}
         }
       }
       Fl_Group {} {
         label {&tab4} open
-        tooltip {this tab show the issue of indicating a selcted tab if the tab layouts are very similar} xywh {10 60 300 180} selection_color 5 labeltype ENGRAVED_LABEL labelfont 2 hide
+        tooltip {this tab show the issue of indicating a selcted tab if the tab layouts are very similar} xywh {10 60 315 235} selection_color 5 labeltype ENGRAVED_LABEL labelfont 2 hide
       } {
         Fl_Button {} {
           label button2
-          xywh {20 80 60 110}
+          xywh {20 55 60 110}
         }
         Fl_Button {} {
           label button
-          xywh {80 80 60 110}
+          xywh {80 55 60 110}
         }
         Fl_Button {} {
           label button
-          xywh {140 80 60 110}
+          xywh {140 55 60 110}
         }
       }
       Fl_Group {} {
         label {@fileprint  &print} open
-        tooltip {tab5 verifies if visibility requests are handled correctly} xywh {10 60 300 180} hide
+        tooltip {tab5 verifies if visibility requests are handled correctly} xywh {10 60 315 235} hide
       } {
         Fl_Button {} {
           label button2
-          tooltip {button2 has a different tooltp than tab5} xywh {20 75 60 80}
+          tooltip {button2 has a different tooltp than tab5} xywh {20 55 60 80}
         }
         Fl_Button {} {
           label button
-          xywh {90 75 60 80}
+          xywh {90 55 60 80}
         }
         Fl_Clock {} {
           label {Make sure this clock does not use processor time when this tab is hidden or window is iconized}
-          xywh {160 75 100 100} box OSHADOW_BOX color 238 selection_color 0 labelfont 8 labelsize 10 align 130
+          xywh {160 55 100 100} box OSHADOW_BOX color 238 selection_color 0 labelfont 8 labelsize 10 align 130
         }
         Fl_Group {} {open
-          xywh {20 175 40 55} box THIN_DOWN_BOX color 173 align 16
+          xywh {20 155 40 55} box THIN_DOWN_BOX color 173 align 16
           class Fl_Window
         } {}
         Fl_Group {} {
           label {subwindows:} open
-          xywh {65 175 40 55} box THIN_DOWN_BOX color 167
+          xywh {65 155 40 55} box THIN_DOWN_BOX color 167
           class Fl_Window
         } {}
         Fl_Group {} {open
-          xywh {110 175 40 55} box THIN_DOWN_BOX color 239 align 16
+          xywh {110 155 40 55} box THIN_DOWN_BOX color 239 align 16
           class Fl_Window
         } {}
       }
@@ -129,160 +129,160 @@ Function {} {open
       xywh {410 0 130 35} labeltype ENGRAVED_LABEL labelfont 1
     }
     Fl_Wizard wWizard {
-      xywh {325 60 300 180}
+      xywh {330 35 320 260}
     } {
       Fl_Group {} {
         label Label1 open
-        tooltip {this Tab tests correct keyboard navigation between text input fields} xywh {325 60 300 180} selection_color 1 resizable
+        tooltip {this Tab tests correct keyboard navigation between text input fields} xywh {330 60 320 235} selection_color 1 resizable
       } {
         Fl_Input {} {
           label {input:}
-          tooltip {This is the first input field} xywh {375 80 240 40}
+          tooltip {This is the first input field} xywh {390 80 240 40}
         }
         Fl_Input {} {
           label {input2:}
-          xywh {375 120 240 30}
+          xywh {390 120 240 30}
           code0 {o->tooltip("");}
         }
         Fl_Input {} {
           label {input3:}
-          xywh {375 150 240 80}
+          xywh {390 150 240 80}
         }
       }
       Fl_Group {} {
         label tab2 open
-        tooltip {tab2 tests among other things the cooperation of modal windows and tabs} xywh {325 60 300 180} selection_color 2 hide
+        tooltip {tab2 tests among other things the cooperation of modal windows and tabs} xywh {330 60 320 235} selection_color 2 hide
       } {
         Fl_Button {} {
           label button1
           callback {fl_message("Test to see if this modal window prevents you from "
            "changing the tabs. It should.");}
-          xywh {335 90 100 30}
+          xywh {350 85 100 30}
           code0 {\#include <FL/fl_ask.H>}
         }
         Fl_Input {} {
           label {input in box2}
-          xywh {455 130 100 30}
+          xywh {455 130 175 30}
         }
         Fl_Button {} {
           label {This is stuff inside the Fl_Group "tab2"}
-          xywh {345 170 260 30}
+          xywh {350 170 280 30}
         }
         Fl_Button {} {
           label {Test event blocking by modal window}
           callback {fl_message("Make sure you cannot change the tabs while this modal window is up");}
-          xywh {345 200 260 30}
+          xywh {350 200 280 30}
           code0 {\#include <FL/fl_ask.H>}
         }
       }
       Fl_Group {} {
         label tab3 open
-        tooltip {tab3 checks for correct keyboard navigation} xywh {325 60 300 180} selection_color 3 hide
+        tooltip {tab3 checks for correct keyboard navigation} xywh {330 50 320 245} selection_color 3 hide
       } {
         Fl_Button {} {
           label button2
-          xywh {335 90 60 80}
+          xywh {350 80 60 80}
         }
         Fl_Button {} {
           label button
-          xywh {395 90 60 80}
+          xywh {410 80 60 80}
         }
         Fl_Button {} {
           label button
-          xywh {455 90 60 80}
+          xywh {470 80 60 80}
         }
       }
       Fl_Group {} {
         label tab4 open
-        tooltip {this tab show the issue of indicating a selcted tab if the tab layouts are very similar} xywh {325 60 300 180} selection_color 5 labelfont 2 hide
+        tooltip {this tab show the issue of indicating a selcted tab if the tab layouts are very similar} xywh {330 60 320 235} selection_color 5 labelfont 2 hide
       } {
         Fl_Button {} {
           label button2
-          xywh {335 80 60 110}
+          xywh {350 80 60 110}
         }
         Fl_Button {} {
           label button
-          xywh {395 80 60 110}
+          xywh {410 80 60 110}
         }
         Fl_Button {} {
           label button
-          xywh {455 80 60 110}
+          xywh {470 80 60 110}
         }
       }
       Fl_Group {} {
         label {     tab5      } open
-        tooltip {tab5 verifies if visibility requests are handled correctly} xywh {325 60 300 180} labeltype ENGRAVED_LABEL hide
+        tooltip {tab5 verifies if visibility requests are handled correctly} xywh {330 65 320 230} labeltype ENGRAVED_LABEL hide
       } {
         Fl_Button {} {
           label button2
-          tooltip {button2 has a different tooltp than tab5} xywh {335 75 60 80}
+          tooltip {button2 has a different tooltp than tab5} xywh {350 80 60 80}
         }
         Fl_Button {} {
           label button
-          xywh {405 75 60 80}
+          xywh {420 80 60 80}
         }
         Fl_Clock {} {
           label {Make sure this clock does not use processor time when this tab is hidden or window is iconized}
-          xywh {475 75 100 100} box OSHADOW_BOX color 238 selection_color 0 labelfont 8 labelsize 10 align 130
+          xywh {490 80 100 100} box OSHADOW_BOX color 238 selection_color 0 labelfont 8 labelsize 10 align 130
         }
         Fl_Group {} {open
-          xywh {335 175 40 55} box THIN_DOWN_BOX color 173 align 16
+          xywh {350 180 40 55} box THIN_DOWN_BOX color 173 align 16
           class Fl_Window
         } {}
         Fl_Group {} {
           label {subwindows:} open
-          xywh {380 175 40 55} box THIN_DOWN_BOX color 167
+          xywh {395 180 40 55} box THIN_DOWN_BOX color 167
           class Fl_Window
         } {}
         Fl_Group {} {open
-          xywh {425 175 40 55} box THIN_DOWN_BOX color 239 align 16
+          xywh {440 180 40 55} box THIN_DOWN_BOX color 239 align 16
           class Fl_Window
         } {}
       }
     }
     Fl_Group {} {
-      xywh {410 245 130 25}
+      xywh {410 305 130 25}
     } {
       Fl_Button {} {
         label {@|<}
         callback {wWizard->value(wWizard->child(0));}
-        tooltip {go to first page [Home]} xywh {410 245 30 25} shortcut 0xff50
+        tooltip {go to first page [Home]} xywh {410 305 30 25} shortcut 0xff50
       }
       Fl_Button {} {
         label {@<}
         callback {wWizard->prev();}
-        tooltip {go to previous page [left arrow]} xywh {440 245 30 25} shortcut 0xff51
+        tooltip {go to previous page [left arrow]} xywh {440 305 30 25} shortcut 0xff51
       }
       Fl_Button {} {
         label {@>}
         callback {wWizard->next();}
-        tooltip {go to next page in wizard [right arrow]} xywh {480 245 30 25} shortcut 0xff53
+        tooltip {go to next page in wizard [right arrow]} xywh {480 305 30 25} shortcut 0xff53
       }
       Fl_Button {} {
         label {@>|}
         callback {int last = wWizard->children()-1;
 wWizard->value(wWizard->child(last));}
-        tooltip {go to last page [End]} xywh {510 245 30 25} shortcut 0xff57
+        tooltip {go to last page [End]} xywh {510 305 30 25} shortcut 0xff57
       }
     }
     Fl_Input {} {
       label {inputA:}
-      xywh {60 255 130 25}
+      xywh {60 310 130 25}
     }
     Fl_Input {} {
       label {inputB:}
-      xywh {60 285 250 25}
+      xywh {60 345 250 25}
     }
     Fl_Button {} {
       label cancel
       callback {exit(1);}
-      xywh {475 295 70 30}
+      xywh {490 345 70 30}
       code0 {\#include <stdlib.h>}
     }
     Fl_Return_Button {} {
       label OK
       callback {exit(0);}
-      xywh {555 295 70 30}
+      xywh {570 345 70 30}
       code0 {\#include <stdlib.h>}
     }
   }