From 93ea93ee2b424ded25358d87529b1160cdb4f80c Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Tue, 1 Nov 2022 13:30:05 +0100 Subject: Fluid support for Fl_Flex (#523) and some Fl_Flex improvements * Adding Fluid support for Fl_Flex, margins, and gap. * Fluid Fl_Flex mostly working. Fixed in Fl_Flex::set_size(). * Fluid Flex live mode works, interactive dragging works * Fluid Flex: adding check box for fixed children * Fluid Flex: visual flexibility indicator in guides. * Fluid Flex: bug in generated code. * Fix formatting * Fixing Tooltip, fixing resize issue PR #518. * Removing unused variables. Co-authored-by: Albrecht Schlosser --- fluid/function_panel.fl | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'fluid/function_panel.fl') diff --git a/fluid/function_panel.fl b/fluid/function_panel.fl index 0186b9365..f096d323a 100644 --- a/fluid/function_panel.fl +++ b/fluid/function_panel.fl @@ -50,7 +50,7 @@ Function {use_tab_navigation(int, Fl_Text_Editor*)} { Function {make_function_panel()} {open } { Fl_Window function_panel { - label {Function/Method Properties} open + label {Function/Method Properties} xywh {540 418 343 232} type Double hide resizable modal } { Fl_Group {} {open @@ -537,15 +537,15 @@ else add_new_widget_from_user(type_name, kAddAfterCurrent);} {} } -Function {make_widgetbin()} {open selected +Function {make_widgetbin()} {open } { Fl_Window widgetbin_panel { label {Widget Bin} callback {if (Fl::event()==FL_SHORTCUT && Fl::event_key()==FL_Escape) exit_cb((Fl_Widget*)o, v); else - toggle_widgetbin_cb((Fl_Widget*)o, v);} - xywh {449 206 600 102} type Single align 80 hide non_modal + toggle_widgetbin_cb((Fl_Widget*)o, v);} open + xywh {449 206 600 102} type Single align 80 non_modal visible } { Fl_Group {} { label Code open @@ -645,6 +645,13 @@ else code0 {o->image(pixmap[19]);} class Widget_Bin_Button } + Fl_Button {} { + user_data {"Fl_Flex"} + callback type_make_cb selected + tooltip Flex xywh {139 46 24 24} box THIN_UP_BOX + code0 {o->image(pixmap[56]);} + class Widget_Bin_Button + } Fl_Button {} { user_data {"Fl_Tile"} callback type_make_cb -- cgit v1.2.3