Author: greg.ercolano
Date: 2011-02-13 09:31:54 -0800 (Sun, 13 Feb 2011)
New Revision: 8421
Log:
Enlarged pulldown menu choosers slightly.
(They were too small vertically, cutting off font descenders under linux.)
Modified:
branches/branch-1.3/test/tree.fl
Modified: branches/branch-1.3/test/tree.fl
===================================================================
--- branches/branch-1.3/test/tree.fl 2011-02-13 17:30:17 UTC (rev 8420)
+++ branches/branch-1.3/test/tree.fl 2011-02-13 17:31:54 UTC (rev 8421)
@@ -162,7 +162,7 @@
} {
Fl_Window window {
label tree open
- xywh {800 102 1015 420} type Double visible
+ xywh {800 102 1015 445} type Double visible
} {
Fl_Group tree {
label Tree
@@ -179,16 +179,16 @@
fprintf(stderr, "TREE CALLBACK: reason=%s item=(no item -- probably multiple
items were changed at once)\\n",
reason_as_name(tree->callback_reason()));
}} open
- tooltip {Test tree} xywh {15 22 280 385} box DOWN_BOX color 55
selection_color 15
+ tooltip {Test tree} xywh {15 22 280 411} box DOWN_BOX color 55
selection_color 15
class Fl_Tree
} {}
Fl_Group {} {open selected
- xywh {300 5 705 410}
+ xywh {300 5 705 427}
code0 {o->resizable(0);}
} {
Fl_Box {} {
label {Tree Globals}
- tooltip {These controls only affect the selected items. If no items
are selected, all existing items in tree are modified.} xywh {311 23 335 241}
box GTK_DOWN_BOX color 47 labelsize 12 align 1
+ tooltip {These controls only affect the selected items. If no items
are selected, all existing items in tree are modified.} xywh {311 23 335 263}
box GTK_DOWN_BOX color 47 labelsize 12 align 1
}
Fl_Value_Slider margintop_slider {
label {margintop()}
@@ -315,7 +315,7 @@
tree->showcollapse(0);
break;
}}
- tooltip {Tests Fl_Tree::openicon() and Fl_Tree::closeicon()} xywh {486
96 140 18} down_box BORDER_BOX labelsize 12 textsize 11
+ tooltip {Tests Fl_Tree::openicon() and Fl_Tree::closeicon()} xywh {486
96 140 21} down_box BORDER_BOX labelsize 12 textsize 11
} {
MenuItem {} {
label Normal
@@ -338,7 +338,7 @@
case 1: tree->connectorstyle(FL_TREE_CONNECTOR_DOTTED); break;
case 2: tree->connectorstyle(FL_TREE_CONNECTOR_SOLID); break;
}}
- tooltip {Tests connectorstyle() bit flags} xywh {486 116 140 18}
down_box BORDER_BOX labelsize 12 textsize 11
+ tooltip {Tests connectorstyle() bit flags} xywh {486 120 140 21}
down_box BORDER_BOX labelsize 12 textsize 11
code0 {switch (tree->connectorstyle()) { case FL_TREE_CONNECTOR_NONE:
connectorstyle_chooser->value(0); break; case FL_TREE_CONNECTOR_DOTTED:
connectorstyle_chooser->value(1); break; case FL_TREE_CONNECTOR_SOLID:
connectorstyle_chooser->value(2); break; }}
} {
MenuItem {} {
@@ -363,7 +363,7 @@
case 2: tree->selectmode(FL_TREE_SELECT_MULTI); break; // Multi
default: tree->selectmode(FL_TREE_SELECT_SINGLE); break; // Single
}}
- tooltip {Sets how Fl_Tree handles mouse selection of tree items} xywh
{486 136 140 18} down_box BORDER_BOX labelsize 12 textsize 11
+ tooltip {Sets how Fl_Tree handles mouse selection of tree items} xywh
{486 144 140 21} down_box BORDER_BOX labelsize 12 textsize 11
code0 {selectmode_chooser->value(1);}
code1 {cb_selectmode_chooser(selectmode_chooser, (void*)0);}
} {
@@ -389,7 +389,7 @@
case 2: tree->when(FL_WHEN_NEVER); break;
default: tree->when(FL_WHEN_RELEASE); break;
}}
- tooltip {Sets when() the tree's callback is invoked} xywh {486 156 140
18} down_box BORDER_BOX labelsize 12 textsize 11
+ tooltip {Sets when() the tree's callback is invoked} xywh {486 168 140
21} down_box BORDER_BOX labelsize 12 textsize 11
code0 {whenmode_chooser->value(1);}
code1 {cb_whenmode_chooser(whenmode_chooser, (void*)0);}
} {
@@ -457,14 +457,14 @@
if ( ( i = tree->find_item("Bbb/bgb/222") ) != NULL ) i->usericon(0);
if ( ( i = tree->find_item("Bbb/bgb/333") ) != NULL ) i->usericon(0);
}}
- tooltip {Tests Fl_Tree_Item::usericon()} xywh {486 182 20 16} down_box
DOWN_BOX labelsize 12 align 7
+ tooltip {Tests Fl_Tree_Item::usericon()} xywh {486 194 20 16} down_box
DOWN_BOX labelsize 12 align 7
}
Fl_Check_Button showroot_radio {
label {Show root?}
user_data tree
callback {int onoff = showroot_radio->value();
tree->showroot(onoff);}
- tooltip {Tests tree->showroot();} xywh {486 199 20 16} down_box
DOWN_BOX labelsize 12 align 7
+ tooltip {Tests tree->showroot();} xywh {486 211 20 16} down_box
DOWN_BOX labelsize 12 align 7
code0 {int onoff = tree->showroot(); showroot_radio->value(onoff);}
}
Fl_Check_Button visiblefocus_checkbox {
@@ -472,7 +472,7 @@
user_data tree
callback {int onoff = visiblefocus_checkbox->value();
tree->visible_focus(onoff);}
- tooltip {Toggles the tree's visible_focus() box} xywh {486 216 20 16}
down_box DOWN_BOX labelsize 12 align 7
+ tooltip {Toggles the tree's visible_focus() box} xywh {486 228 20 16}
down_box DOWN_BOX labelsize 12 align 7
code0 {int onoff = tree->visible_focus();
visiblefocus_checkbox->value(onoff);}
}
Fl_Button selection_color_button {
@@ -481,17 +481,17 @@
selection_color_button->color(val); // update modified color to button
tree->selection_color(val);
tree->redraw();}
- tooltip {Changes the tree widget's selection color. Tests
Fl_Tree::selection_color()} xywh {486 239 16 16} box DOWN_BOX labelsize 12
align 7
+ tooltip {Changes the tree widget's selection color. Tests
Fl_Tree::selection_color()} xywh {486 251 16 16} box DOWN_BOX labelsize 12
align 7
code0 {o->color(tree->selection_color());}
}
Fl_Box {} {
label {Test Operations}
- tooltip {These controls only affect the defaults for new items that
are created. These test the Fl_Tree_Prefs methods.} xywh {311 286 335 120} box
GTK_DOWN_BOX color 47 labelsize 12 align 1
+ tooltip {These controls only affect the defaults for new items that
are created. These test the Fl_Tree_Prefs methods.} xywh {311 312 335 120} box
GTK_DOWN_BOX color 47 labelsize 12 align 1
}
Fl_Box showitem_box {
label {show_item()
}
- xywh {331 309 70 82} box GTK_DOWN_BOX labelsize 11 align 1
+ xywh {331 335 70 82} box GTK_DOWN_BOX labelsize 11 align 1
}
Fl_Button {} {
label Show
@@ -499,7 +499,7 @@
tree->show_item(item);}
tooltip {Tests show_item() with no position specified.
Makes the selected item visible IF it is off-screen.
-No change made if it is not off-screen.} xywh {346 318 40 17} labelsize 11
+No change made if it is not off-screen.} xywh {346 344 40 17} labelsize 11
}
Fl_Button {} {
label Top
@@ -511,7 +511,7 @@
To use:
1) open '500 items'
2) select item 0010
-3) Hit Top/Mid/Bot} xywh {346 335 40 16} labelsize 11
+3) Hit Top/Mid/Bot} xywh {346 361 40 16} labelsize 11
}
Fl_Button {} {
label Mid
@@ -522,7 +522,7 @@
To use:
1) open '500 items'
2) select 'item 0010'
- 3) Hit Top/Mid/Bot} xywh {346 351 40 16} labelsize 11
+ 3) Hit Top/Mid/Bot} xywh {346 377 40 16} labelsize 11
}
Fl_Button {} {
label Bot
@@ -533,7 +533,7 @@
To use:
1) open '500 items'
2) select 'item 0010'
- 3) Hit Top/Mid/Bot} xywh {346 367 40 16} labelsize 11
+ 3) Hit Top/Mid/Bot} xywh {346 393 40 16} labelsize 11
}
Fl_Button loaddb_button {
label {Load Database...}
@@ -544,7 +544,7 @@
tree->load(prefs);
tree->redraw();
}}
- tooltip {Load the contents of an Fl_Preferences database into the tree
view} xywh {431 312 95 16} labelsize 9
+ tooltip {Load the contents of an Fl_Preferences database into the tree
view} xywh {431 338 95 16} labelsize 9
}
Fl_Button insertabove_button {
label {Insert Above}
@@ -559,12 +559,12 @@
}
tree->redraw();}
- tooltip {Inserts three items above the selected items} xywh {431 332
95 16} labelsize 9
+ tooltip {Inserts three items above the selected items} xywh {431 358
95 16} labelsize 9
}
Fl_Button rebuildtree_button {
label {Rebuild Tree}
callback {RebuildTree();}
- tooltip {Rebuilds the tree with defaults} xywh {431 352 95 16}
labelsize 9
+ tooltip {Rebuilds the tree with defaults} xywh {431 378 95 16}
labelsize 9
}
Fl_Button showpathname_button {
label {Show Pathname}
@@ -577,14 +577,14 @@
case -1: fl_message("item_pathname() returned -1 (NOT FOUND)"); break;
case -2: fl_message("item_pathname() returned -2 (STRING TOO LONG)");
break;
}}
- tooltip {Show the pathname for the selected item. Tests the
Fl_Tree::item_pathname() method.} xywh {431 372 95 16} labelsize 9
+ tooltip {Show the pathname for the selected item. Tests the
Fl_Tree::item_pathname() method.} xywh {431 398 95 16} labelsize 9
}
Fl_Button clearall_button {
label {Clear All}
callback {tree->clear();
tree->redraw();}
tooltip {Clears all items
-Tests Fl_Tree::clear()} xywh {531 312 95 16} labelsize 9
+Tests Fl_Tree::clear()} xywh {531 338 95 16} labelsize 9
}
Fl_Button testcallbackflag_button {
label {Test Callback Flag}
@@ -649,11 +649,11 @@
tree->deselect("ROOT"); // leave deselected
fl_alert("TEST COMPLETED\\n If you didn't see any error dialogs, test
PASSED.");}
- tooltip {Test the 'docallback' argument can disable callbacks.} xywh
{531 332 95 16} labelsize 9
+ tooltip {Test the 'docallback' argument can disable callbacks.} xywh
{531 358 95 16} labelsize 9
}
Fl_Box {} {
label {Selected Items}
- tooltip {These controls only affect the selected items. If no items
are selected, all existing items in tree are modified.} xywh {661 23 335 241}
box GTK_DOWN_BOX color 47 labelsize 12 align 1
+ tooltip {These controls only affect the selected items. If no items
are selected, all existing items in tree are modified.} xywh {661 23 335 263}
box GTK_DOWN_BOX color 47 labelsize 12 align 1
}
Fl_Choice all_font_choice {
label {Label Font}
@@ -681,7 +681,7 @@
}
tree->redraw();}
- tooltip {Changes the font for the selected items's labels. If none
selected, all are changed. Tests Fl_Tree_Item::labelfont();} xywh {828 31 140
18} down_box BORDER_BOX labelsize 12 textsize 11
+ tooltip {Changes the font for the selected items's labels. If none
selected, all are changed. Tests Fl_Tree_Item::labelfont();} xywh {828 31 140
21} down_box BORDER_BOX labelsize 12 textsize 11
code0 {o->value((int)tree->item_labelfont()); // get tree's current
font, assign to chooser}
} {
MenuItem {} {
@@ -772,7 +772,7 @@
}
tree->redraw();}
- tooltip {Changes the font size of the selected items's labels. If none
selected, all are changed. Tests Fl_Tree_Item::labelsize();} xywh {828 53 140
16} type Horizontal labelsize 12 align 4 step 0.01 textsize 12
+ tooltip {Changes the font size of the selected items's labels. If none
selected, all are changed. Tests Fl_Tree_Item::labelsize();} xywh {828 55 140
16} type Horizontal labelsize 12 align 4 step 0.01 textsize 12
code0 {o->value(tree->item_labelsize());}
code1 {o->range(5.0, 200.0);}
code2 {o->step(1.0);}
@@ -805,7 +805,7 @@
}
tree->redraw();}
- tooltip {Changes the label fg color for the selected items. If none
selected, all are changed. Tests Fl_Tree_Item::labelfgcolor();} xywh {828 79 16
16} box DOWN_BOX labelsize 12 align 7
+ tooltip {Changes the label fg color for the selected items. If none
selected, all are changed. Tests Fl_Tree_Item::labelfgcolor();} xywh {828 81 16
16} box DOWN_BOX labelsize 12 align 7
code0 {o->color(tree->item_labelfgcolor());}
}
Fl_Button all_labelbgcolor_button {
@@ -835,14 +835,14 @@
}
tree->redraw();}
- tooltip {Changes the label bg color for the selected items. If none
selected, all are changed. Tests Fl_Tree_Item::labelbgcolor();} xywh {828 97 16
16} box DOWN_BOX labelsize 12 align 7
+ tooltip {Changes the label bg color for the selected items. If none
selected, all are changed. Tests Fl_Tree_Item::labelbgcolor();} xywh {828 99 16
16} box DOWN_BOX labelsize 12 align 7
code0 {o->color(tree->item_labelbgcolor());}
}
Fl_Value_Slider connectorwidth_slider {
label {Connector Width}
user_data tree
callback {tree->connectorwidth((int)connectorwidth_slider->value());}
- tooltip {Tests Fl_Tree::connectorwidth()} xywh {828 124 140 16} type
Horizontal labelsize 12 align 4 step 0.01 textsize 12
+ tooltip {Tests Fl_Tree::connectorwidth()} xywh {828 126 140 16} type
Horizontal labelsize 12 align 4 step 0.01 textsize 12
code0 {o->value(tree->connectorwidth());}
code1 {o->range(1.0, 100.0);}
code2 {o->step(1.0);}
@@ -869,7 +869,7 @@
tree->redraw();}
tooltip {Toggle the deactivation state of the selected items.
-If none are selected, all are set.} xywh {734 152 95 16} selection_color 1
labelsize 9
+If none are selected, all are set.} xywh {734 154 95 16} selection_color 1
labelsize 9
}
Fl_Light_Button bold_toggle {
label { Bold Font}
@@ -894,7 +894,7 @@
tree->redraw();}
tooltip {Toggles bold font for selected items
-If nothing selected, all are changed} xywh {734 172 95 16} selection_color 1
labelsize 9
+If nothing selected, all are changed} xywh {734 174 95 16} selection_color 1
labelsize 9
}
Fl_Button showselected_button {
label {Show Selected}
@@ -904,7 +904,7 @@
item = tree->next_selected_item(item) ) {
fprintf(stderr, "\\t%s\\n", item->label() ? item->label() : "???");
}}
- tooltip {Clears the selected items} xywh {829 152 95 16} labelsize 9
+ tooltip {Clears the selected items} xywh {829 154 95 16} labelsize 9
}
Fl_Button clearselected_button {
label {Remove Selected}
@@ -919,19 +919,19 @@
}
tree->redraw();}
- tooltip {Removes the selected items} xywh {829 172 95 16} labelsize 9
+ tooltip {Removes the selected items} xywh {829 174 95 16} labelsize 9
}
Fl_Button selectall_button {
label {Select All}
callback {tree->select_all(0);
tree->redraw();}
- tooltip {Selects all items in the tree} xywh {689 199 95 16} labelsize
9
+ tooltip {Selects all items in the tree} xywh {689 201 95 16} labelsize
9
}
Fl_Button deselectall_button {
label {Deselect All}
callback {tree->deselect_all(0);
tree->redraw();}
- tooltip {Deselects all items in the tree} xywh {689 219 95 16}
labelsize 9
+ tooltip {Deselects all items in the tree} xywh {689 221 95 16}
labelsize 9
}
Fl_Light_Button bbbselect_toggle {
label { Select Bbb}
@@ -945,7 +945,7 @@
if ( onoff ) tree->select(bbb); // select /Bbb
else tree->deselect(bbb); // deselect /Bbb}
tooltip {Toggle selection of just the /Bbb item
-(Not children)} xywh {784 199 95 16} selection_color 1 labelsize 9
+(Not children)} xywh {784 201 95 16} selection_color 1 labelsize 9
}
Fl_Light_Button bbbselect2_toggle {
label { Select Bbb+}
@@ -958,7 +958,7 @@
int onoff = bbbselect2_toggle->value();
if ( onoff ) tree->select_all(bbb); // select /Bbb and its children
else tree->deselect_all(bbb); // deselect /Bbb and its children}
- tooltip {Toggle selection of the /Bbb item and its children} xywh {784
219 95 16} selection_color 1 labelsize 9
+ tooltip {Toggle selection of the /Bbb item and its children} xywh {784
221 95 16} selection_color 1 labelsize 9
}
Fl_Light_Button bbbchild02select_toggle {
label { Toggle child-02}
@@ -973,7 +973,7 @@
fl_alert("FAIL: Couldn't find item '%s'",pathname);
return;
}}
- tooltip {Toggle the single item "/Bbb/child-02" using the item's
"pathname".} xywh {784 239 95 16} selection_color 1 labelsize 9
+ tooltip {Toggle the single item "/Bbb/child-02" using the item's
"pathname".} xywh {784 241 95 16} selection_color 1 labelsize 9
}
Fl_Light_Button rootselect_toggle {
label {Select ROOT}
@@ -986,7 +986,7 @@
int onoff = rootselect_toggle->value();
if ( onoff ) tree->select(item); // select /ROOT and its children
else tree->deselect(item); // deselect /ROOT and its children}
- tooltip {Toggle selection of the ROOT item} xywh {879 199 95 16}
selection_color 1 labelsize 9
+ tooltip {Toggle selection of the ROOT item} xywh {879 201 95 16}
selection_color 1 labelsize 9
}
Fl_Light_Button rootselect2_toggle {
label {Select ROOT+}
@@ -999,18 +999,18 @@
int onoff = rootselect2_toggle->value();
if ( onoff ) tree->select_all(item); // select /ROOT and its children
else tree->deselect_all(item); // deselect /ROOT and its children}
- tooltip {Toggle selection of the ROOT item and all children} xywh {879
219 95 16} selection_color 1 labelsize 9
+ tooltip {Toggle selection of the ROOT item and all children} xywh {879
221 95 16} selection_color 1 labelsize 9
}
Fl_Box {} {
label {New Item Defaults}
- tooltip {These controls only affect the defaults for new items that
are created. These test the Fl_Tree_Prefs methods.} xywh {661 286 335 120} box
GTK_DOWN_BOX color 47 labelsize 12 align 1
+ tooltip {These controls only affect the defaults for new items that
are created. These test the Fl_Tree_Prefs methods.} xywh {661 312 335 120} box
GTK_DOWN_BOX color 47 labelsize 12 align 1
}
Fl_Button item_labelfgcolor_button {
label item_labelfgcolor
callback {Fl_Color val = EditColor(tree->item_labelfgcolor()); // Let
user edit the color
tree->item_labelfgcolor(val); // apply modified color
to tree
item_labelfgcolor_button->color(val); // update modified
color to button}
- tooltip {Sets the *default* label foreground color for new items
created. Does NOT affect existing items.} xywh {828 301 16 16} box DOWN_BOX
labelsize 12 align 7
+ tooltip {Sets the *default* label foreground color for new items
created. Does NOT affect existing items.} xywh {828 327 16 16} box DOWN_BOX
labelsize 12 align 7
code0 {o->color(tree->item_labelfgcolor());}
}
Fl_Button item_labelbgcolor_button {
@@ -1018,14 +1018,14 @@
callback {Fl_Color val = EditColor(tree->item_labelbgcolor()); // Let
user edit the color
tree->item_labelbgcolor(val); // apply modified color
to tree
item_labelbgcolor_button->color(val); // update modified
color to button}
- tooltip {Sets the *default* label background color for new items
created. Does NOT affect existing items.} xywh {828 319 16 16} box DOWN_BOX
labelsize 12 align 7
+ tooltip {Sets the *default* label background color for new items
created. Does NOT affect existing items.} xywh {828 345 16 16} box DOWN_BOX
labelsize 12 align 7
code0 {item_labelbgcolor_button->color(tree->item_labelbgcolor());}
}
Fl_Choice item_font_choice {
label {Item label font}
callback {Fl_Font val = (Fl_Font)item_font_choice->value(); // get
chooser's current font value
tree->item_labelfont(val); // change font in tree}
- tooltip {Sets the default font used for new items created. Does NOT
affect existing items.} xywh {828 345 140 18} down_box BORDER_BOX labelsize 12
textsize 12
+ tooltip {Sets the default font used for new items created. Does NOT
affect existing items.} xywh {828 371 140 21} down_box BORDER_BOX labelsize 12
textsize 12
code0 {o->value((int)tree->item_labelfont()); // get tree's current
font, assign to chooser}
} {
MenuItem {} {
@@ -1097,7 +1097,7 @@
label item_labelsize
user_data tree
callback {tree->item_labelsize((int)item_labelsize_slider->value());}
- tooltip {Sets the default labelsize used for new items. Does NOT
affect existing items.} xywh {828 366 140 16} type Horizontal labelsize 12
align 4 step 0.01 textsize 12
+ tooltip {Sets the default labelsize used for new items. Does NOT
affect existing items.} xywh {828 396 140 16} type Horizontal labelsize 12
align 4 step 0.01 textsize 12
code0 {o->value((int)tree->item_labelsize());}
code1 {o->range(1.0, 50.0);}
code2 {o->step(1.0);}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
