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.cxx | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'fluid/function_panel.cxx') diff --git a/fluid/function_panel.cxx b/fluid/function_panel.cxx index 8e28df2ad..b43ec8056 100644 --- a/fluid/function_panel.cxx +++ b/fluid/function_panel.cxx @@ -856,6 +856,20 @@ Fl_Window* make_widgetbin() { o->when(FL_WHEN_RELEASE); o->image(pixmap[19]); } // Widget_Bin_Button* o + { Widget_Bin_Button* o = new Widget_Bin_Button(139, 46, 24, 24); + o->tooltip("Flex"); + o->box(FL_THIN_UP_BOX); + o->color(FL_BACKGROUND_COLOR); + o->selection_color(FL_BACKGROUND_COLOR); + o->labeltype(FL_NORMAL_LABEL); + o->labelfont(0); + o->labelsize(14); + o->labelcolor(FL_FOREGROUND_COLOR); + o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Flex")); + o->align(Fl_Align(FL_ALIGN_CENTER)); + o->when(FL_WHEN_RELEASE); + o->image(pixmap[56]); + } // Widget_Bin_Button* o { Widget_Bin_Button* o = new Widget_Bin_Button(89, 71, 24, 24); o->tooltip("Tile"); o->box(FL_THIN_UP_BOX); -- cgit v1.2.3