Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-02 23:56:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix text overflow in fluid widget panel (#908)

Browse Source 
Made fonts slightly smaller,
enlarged/moved some widgets in Alignment: group.
This commit is contained in:
Greg Ercolano
2024-02-15 09:25:28 -08:00
parent 0987c763ec
commit cc562761c2
2 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fluid/widget_panel.cxx
+26 -26
View File
@@ -424,31 +424,31 @@ static void cb_(Fl_Button*, void* v) {
Fl_Input *widget_deimage_input=(Fl_Input *)0; Fl_Input *widget_deimage_input=(Fl_Input *)0;
Fl_Menu_Item menu_[] = { Fl_Menu_Item menu_[] = {
{" Image Alignment ", 0, 0, (void*)((fl_intptr_t)0xFFFFFFFF), 1, (uchar)FL_NORMAL_LABEL, 2, 11, 0}, {" Image Alignment ", 0, 0, (void*)((fl_intptr_t)0xFFFFFFFF), 1, (uchar)FL_NORMAL_LABEL, 2, 10, 0},
{"image over text", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_IMAGE_OVER_TEXT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, {"image over text", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_IMAGE_OVER_TEXT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0},
{"text over image", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_TEXT_OVER_IMAGE), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, {"text over image", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_TEXT_OVER_IMAGE), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0},
{"text next to image", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_TEXT_NEXT_TO_IMAGE), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, {"text next to image", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_TEXT_NEXT_TO_IMAGE), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0},
{"image next to text", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_IMAGE_NEXT_TO_TEXT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, {"image next to text", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_IMAGE_NEXT_TO_TEXT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0},
{"image is backdrop", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_IMAGE_BACKDROP), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, {"image is backdrop", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_IMAGE_BACKDROP), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0},
{0,0,0,0,0,0,0,0,0} {0,0,0,0,0,0,0,0,0}
}; };
Fl_Menu_Item menu_1[] = { Fl_Menu_Item menu_1[] = {
{" Inside && Outside ", 0, 0, (void*)((fl_intptr_t)0xFFFFFFFF), 1, (uchar)FL_NORMAL_LABEL, 2, 11, 0}, {" Inside && Outside ", 0, 0, (void*)((fl_intptr_t)0xFFFFFFFF), 1, (uchar)FL_NORMAL_LABEL, 2, 10, 0},
{"top left", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_TOP_LEFT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, {"top left", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_TOP_LEFT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0},
{"top", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_TOP), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, {"top", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_TOP), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0},
{"top right", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_TOP_RIGHT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, {"top right", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_TOP_RIGHT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0},
{"left", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_LEFT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, {"left", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_LEFT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0},
{"center", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_CENTER), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, {"center", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_CENTER), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0},
{"right", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_RIGHT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, {"right", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_RIGHT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0},
{"bottom left", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_BOTTOM_LEFT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, {"bottom left", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_BOTTOM_LEFT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0},
{"bottom", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_BOTTOM), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, {"bottom", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_BOTTOM), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0},
{"bottom right", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_BOTTOM_RIGHT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, {"bottom right", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_BOTTOM_RIGHT), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0},
{" Outside Alignment ", 0, 0, (void*)((fl_intptr_t)0xFFFFFFFF), 1, (uchar)FL_NORMAL_LABEL, 2, 11, 0}, {" Outside Alignment ", 0, 0, (void*)((fl_intptr_t)0xFFFFFFFF), 1, (uchar)FL_NORMAL_LABEL, 2, 10, 0},
{"left top", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_LEFT_TOP), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, {"left top", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_LEFT_TOP), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0},
{"right top", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_RIGHT_TOP), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, {"right top", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_RIGHT_TOP), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0},
{"left bottom", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_LEFT_BOTTOM), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, {"left bottom", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_LEFT_BOTTOM), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0},
{"right bottom", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_RIGHT_BOTTOM), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0}, {"right bottom", 0, 0, (void*)((fl_intptr_t)FL_ALIGN_RIGHT_BOTTOM), 0, (uchar)FL_NORMAL_LABEL, 0, 9, 0},
{0,0,0,0,0,0,0,0,0} {0,0,0,0,0,0,0,0,0}
}; };
@@ -1094,21 +1094,21 @@ Fl_Double_Window* make_widget_panel() {
o->callback((Fl_Callback*)align_cb, (void*)((fl_intptr_t)FL_ALIGN_BOTTOM)); o->callback((Fl_Callback*)align_cb, (void*)((fl_intptr_t)FL_ALIGN_BOTTOM));
o->hide(); o->hide();
} // Fl_Button* o } // Fl_Button* o
{ Fl_Choice* o = new Fl_Choice(172, 115, 110, 20); { Fl_Choice* o = new Fl_Choice(172, 115, 116, 20);
o->down_box(FL_BORDER_BOX); o->down_box(FL_BORDER_BOX);
o->labelsize(11); o->labelsize(11);
o->textsize(11); o->textsize(11);
o->callback((Fl_Callback*)align_text_image_cb); o->callback((Fl_Callback*)align_text_image_cb);
o->menu(menu_); o->menu(menu_);
} // Fl_Choice* o } // Fl_Choice* o
{ Fl_Choice* o = new Fl_Choice(288, 115, 85, 20); { Fl_Choice* o = new Fl_Choice(293, 115, 86, 20);
o->down_box(FL_BORDER_BOX); o->down_box(FL_BORDER_BOX);
o->labelsize(11); o->labelsize(11);
o->textsize(11); o->textsize(11);
o->callback((Fl_Callback*)align_position_cb); o->callback((Fl_Callback*)align_position_cb);
o->menu(menu_1); o->menu(menu_1);
} // Fl_Choice* o } // Fl_Choice* o
{ Fl_Button* o = new Fl_Button(378, 115, 20, 20, "@-3square"); { Fl_Button* o = new Fl_Button(384, 115, 20, 20, "@-3square");
o->tooltip("Show the label inside the widget."); o->tooltip("Show the label inside the widget.");
o->type(1); o->type(1);
o->selection_color(FL_INACTIVE_COLOR); o->selection_color(FL_INACTIVE_COLOR);
@@ -2379,12 +2379,12 @@ access the Widget pointer and \'v\' to access the user value.");
wLiveMode->tooltip("Create a live duplicate of the selected widgets to test resizing and menu beh\ wLiveMode->tooltip("Create a live duplicate of the selected widgets to test resizing and menu beh\
avior."); avior.");
wLiveMode->type(1); wLiveMode->type(1);
wLiveMode->labelsize(11); wLiveMode->labelsize(10);
wLiveMode->callback((Fl_Callback*)live_mode_cb); wLiveMode->callback((Fl_Callback*)live_mode_cb);
} // Fl_Button* wLiveMode } // Fl_Button* wLiveMode
{ overlay_button = new Fl_Button(94, 370, 80, 20, "Hide &Overlays"); { overlay_button = new Fl_Button(94, 370, 80, 20, "Hide &Overlays");
overlay_button->tooltip("Hide the widget overlay box."); overlay_button->tooltip("Hide the widget overlay box.");
overlay_button->labelsize(11); overlay_button->labelsize(10);
overlay_button->callback((Fl_Callback*)overlay_cb); overlay_button->callback((Fl_Callback*)overlay_cb);
} // Fl_Button* overlay_button } // Fl_Button* overlay_button
{ // Hidden resizable box { // Hidden resizable box
fluid/widget_panel.fl
+28 -28
View File
@@ -376,7 +376,7 @@ Use Ctrl-J for newlines.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 15 t
} }
Fl_Button {} { Fl_Button {} {
label {Browse...} label {Browse...}
callback image_browse_cb selected callback image_browse_cb
tooltip {Click to choose the active image.} xywh {295 65 89 20} labelsize 11 align 256 tooltip {Click to choose the active image.} xywh {295 65 89 20} labelsize 11 align 256
} }
Fl_Button {} { Fl_Button {} {
@@ -445,124 +445,124 @@ Use Ctrl-J for newlines.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 15 t
} }
Fl_Choice {} { Fl_Choice {} {
callback align_text_image_cb open callback align_text_image_cb open
xywh {172 115 110 20} down_box BORDER_BOX labelsize 11 textsize 11 xywh {172 115 116 20} down_box BORDER_BOX labelsize 11 textsize 11
} { } {
MenuItem {} { MenuItem {} {
label { Image Alignment } label { Image Alignment }
user_data {(fl_intptr_t)0xFFFFFFFF} user_data {(fl_intptr_t)0xFFFFFFFF}
xywh {145 145 100 20} labelfont 2 labelsize 11 deactivate xywh {145 145 100 20} labelfont 2 labelsize 10 deactivate
} }
MenuItem {} { MenuItem {} {
label {image over text} label {image over text}
user_data {(fl_intptr_t)FL_ALIGN_IMAGE_OVER_TEXT} user_data {(fl_intptr_t)FL_ALIGN_IMAGE_OVER_TEXT}
xywh {25 25 100 20} labelsize 11 xywh {25 25 100 20} labelsize 9
} }
MenuItem {} { MenuItem {} {
label {text over image} label {text over image}
user_data {(fl_intptr_t)FL_ALIGN_TEXT_OVER_IMAGE} user_data {(fl_intptr_t)FL_ALIGN_TEXT_OVER_IMAGE}
xywh {15 15 100 20} labelsize 11 xywh {15 15 100 20} labelsize 9
} }
MenuItem {} { MenuItem {} {
label {text next to image} label {text next to image}
user_data {(fl_intptr_t)FL_ALIGN_TEXT_NEXT_TO_IMAGE} user_data {(fl_intptr_t)FL_ALIGN_TEXT_NEXT_TO_IMAGE}
xywh {35 35 100 20} labelsize 11 xywh {35 35 100 20} labelsize 9
} }
MenuItem {} { MenuItem {} {
label {image next to text} label {image next to text}
user_data {(fl_intptr_t)FL_ALIGN_IMAGE_NEXT_TO_TEXT} user_data {(fl_intptr_t)FL_ALIGN_IMAGE_NEXT_TO_TEXT}
xywh {45 45 100 20} labelsize 11 xywh {45 45 100 20} labelsize 9
} }
MenuItem {} { MenuItem {} {
label {image is backdrop} label {image is backdrop}
user_data {(fl_intptr_t)FL_ALIGN_IMAGE_BACKDROP} user_data {(fl_intptr_t)FL_ALIGN_IMAGE_BACKDROP}
xywh {55 55 100 20} labelsize 11 xywh {55 55 100 20} labelsize 9
} }
} }
Fl_Choice {} { Fl_Choice {} {
callback align_position_cb open callback align_position_cb open
xywh {288 115 85 20} down_box BORDER_BOX labelsize 11 textsize 11 xywh {293 115 86 20} down_box BORDER_BOX labelsize 11 textsize 11
} { } {
MenuItem {} { MenuItem {} {
label { Inside && Outside } label { Inside && Outside }
user_data {(fl_intptr_t)0xFFFFFFFF} user_data {(fl_intptr_t)0xFFFFFFFF}
xywh {135 135 100 20} labelfont 2 labelsize 11 deactivate xywh {135 135 100 20} labelfont 2 labelsize 10 deactivate
} }
MenuItem {} { MenuItem {} {
label {top left} label {top left}
user_data {(fl_intptr_t)FL_ALIGN_TOP_LEFT} user_data {(fl_intptr_t)FL_ALIGN_TOP_LEFT}
xywh {45 45 100 20} labelsize 11 xywh {45 45 100 20} labelsize 9
} }
MenuItem {} { MenuItem {} {
label top label top
user_data {(fl_intptr_t)FL_ALIGN_TOP} user_data {(fl_intptr_t)FL_ALIGN_TOP}
xywh {55 55 100 20} labelsize 11 xywh {55 55 100 20} labelsize 9
} }
MenuItem {} { MenuItem {} {
label {top right} label {top right}
user_data {(fl_intptr_t)FL_ALIGN_TOP_RIGHT} user_data {(fl_intptr_t)FL_ALIGN_TOP_RIGHT}
xywh {65 65 100 20} labelsize 11 xywh {65 65 100 20} labelsize 9
} }
MenuItem {} { MenuItem {} {
label left label left
user_data {(fl_intptr_t)FL_ALIGN_LEFT} user_data {(fl_intptr_t)FL_ALIGN_LEFT}
xywh {75 75 100 20} labelsize 11 xywh {75 75 100 20} labelsize 9
} }
MenuItem {} { MenuItem {} {
label center label center
user_data {(fl_intptr_t)FL_ALIGN_CENTER} user_data {(fl_intptr_t)FL_ALIGN_CENTER}
xywh {35 35 100 20} labelsize 11 xywh {35 35 100 20} labelsize 9
} }
MenuItem {} { MenuItem {} {
label right label right
user_data {(fl_intptr_t)FL_ALIGN_RIGHT} user_data {(fl_intptr_t)FL_ALIGN_RIGHT}
xywh {85 85 100 20} labelsize 11 xywh {85 85 100 20} labelsize 9
} }
MenuItem {} { MenuItem {} {
label {bottom left} label {bottom left}
user_data {(fl_intptr_t)FL_ALIGN_BOTTOM_LEFT} user_data {(fl_intptr_t)FL_ALIGN_BOTTOM_LEFT}
xywh {95 95 100 20} labelsize 11 xywh {95 95 100 20} labelsize 9
} }
MenuItem {} { MenuItem {} {
label bottom label bottom
user_data {(fl_intptr_t)FL_ALIGN_BOTTOM} user_data {(fl_intptr_t)FL_ALIGN_BOTTOM}
xywh {105 105 100 20} labelsize 11 xywh {105 105 100 20} labelsize 9
} }
MenuItem {} { MenuItem {} {
label {bottom right} label {bottom right}
user_data {(fl_intptr_t)FL_ALIGN_BOTTOM_RIGHT} user_data {(fl_intptr_t)FL_ALIGN_BOTTOM_RIGHT}
xywh {115 115 100 20} labelsize 11 xywh {115 115 100 20} labelsize 9
} }
MenuItem {} { MenuItem {} {
label { Outside Alignment } label { Outside Alignment }
user_data {(fl_intptr_t)0xFFFFFFFF} user_data {(fl_intptr_t)0xFFFFFFFF}
xywh {125 125 100 20} labelfont 2 labelsize 11 deactivate xywh {125 125 100 20} labelfont 2 labelsize 10 deactivate
} }
MenuItem {} { MenuItem {} {
label {left top} label {left top}
user_data {(fl_intptr_t)FL_ALIGN_LEFT_TOP} user_data {(fl_intptr_t)FL_ALIGN_LEFT_TOP}
xywh {135 135 100 20} labelsize 11 xywh {135 135 100 20} labelsize 9
} }
MenuItem {} { MenuItem {} {
label {right top} label {right top}
user_data {(fl_intptr_t)FL_ALIGN_RIGHT_TOP} user_data {(fl_intptr_t)FL_ALIGN_RIGHT_TOP}
xywh {145 145 100 20} labelsize 11 xywh {145 145 100 20} labelsize 9
} }
MenuItem {} { MenuItem {} {
label {left bottom} label {left bottom}
user_data {(fl_intptr_t)FL_ALIGN_LEFT_BOTTOM} user_data {(fl_intptr_t)FL_ALIGN_LEFT_BOTTOM}
xywh {155 155 100 20} labelsize 11 xywh {155 155 100 20} labelsize 9
} }
MenuItem {} { MenuItem {} {
label {right bottom} label {right bottom}
user_data {(fl_intptr_t)FL_ALIGN_RIGHT_BOTTOM} user_data {(fl_intptr_t)FL_ALIGN_RIGHT_BOTTOM}
xywh {45 45 100 20} labelsize 11 xywh {45 45 100 20} labelsize 9
} }
} }
Fl_Button {} { Fl_Button {} {
label {@-3square} label {@-3square}
user_data {(fl_intptr_t)FL_ALIGN_INSIDE} user_data {(fl_intptr_t)FL_ALIGN_INSIDE}
callback align_cb callback align_cb selected
tooltip {Show the label inside the widget.} xywh {378 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8 tooltip {Show the label inside the widget.} xywh {384 115 20 20} type Toggle selection_color 8 labelsize 11 labelcolor 8
} }
Fl_Box {} { Fl_Box {} {
xywh {404 115 0 20} labelsize 11 resizable xywh {404 115 0 20} labelsize 11 resizable
@@ -1829,12 +1829,12 @@ if (v == LOAD) {
Fl_Button wLiveMode { Fl_Button wLiveMode {
label {Live &Resize} label {Live &Resize}
callback live_mode_cb callback live_mode_cb
tooltip {Create a live duplicate of the selected widgets to test resizing and menu behavior.} xywh {10 370 80 20} type Toggle labelsize 11 tooltip {Create a live duplicate of the selected widgets to test resizing and menu behavior.} xywh {10 370 80 20} type Toggle labelsize 10
} }
Fl_Button overlay_button { Fl_Button overlay_button {
label {Hide &Overlays} label {Hide &Overlays}
callback overlay_cb callback overlay_cb
tooltip {Hide the widget overlay box.} xywh {94 370 80 20} labelsize 11 tooltip {Hide the widget overlay box.} xywh {94 370 80 20} labelsize 10
} }
Fl_Box {} { Fl_Box {} {
comment {Hidden resizable box} comment {Hidden resizable box}