From f37aca15e9786a7192e36ea4b0295ab4dc12819f Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Thu, 28 Jul 2022 18:26:07 +0200 Subject: Add Fl_Flex widget from Karsten Pedersen (issue #255) This work is based on the repository and latest commit: https://github.com/osen/FL_Flex.git commit 36e4ed75a00daac825b87e81295818b4650991f5 Author: Karsten Pedersen <...> Date: Fri Apr 23 12:06:16 2021 +0000 Added Fltk (LGPL) license. This widget is similar to Fl_Pack and supports either one row or one column of widgets but has some more features. Test and demo programs are included: test/flex_login.cxx: simple "login window" demo program test/flex_demo.cxx: slightly more complex demo program The original demo programs can still be compiled and built with the new widget provided you '#include '. Backwards compatible methods are included (except debug()). The original widget has been modified to match FLTK standards and enhanced in several ways, including: - support box frames - add HORIZONTAL and VERTICAL enum values (as in Fl_Pack) - add horizontal() method (as in Fl_Pack) - use type() rather than internal 'direction' variable - add standard widget constructor (x, y, w, h, label) - add margin and gap accessors rather than hard coding constants - improve test and demo programs - add documentation - replace with array as required by FLTK CMP - rename camelCase method names, keeping old names for compatibility: - change 'setSize(Fl_Widget*, int)' to 'set_size(Fl_Widget*, int)' - change 'bool isSetSize(Fl_Widget*)' to 'int set_size(Fl_Widget*)' - remove debug() method - add a way to "unset" fixed size: set_size(Fl_Widget *, 0) - add layout() method to force recalculation of children - unify resizeRow() and resizeCol() methods to avoid code duplication - improve widget size calculation. --- test/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'test/Makefile') diff --git a/test/Makefile b/test/Makefile index 49d56e7be..4b4f5691e 100644 --- a/test/Makefile +++ b/test/Makefile @@ -74,6 +74,8 @@ CPPFILES =\ editor.cxx \ fast_slow.cxx \ file_chooser.cxx \ + flex_demo.cxx \ + flex_login.cxx \ fltk-versions.cxx \ fonts.cxx \ forms.cxx \ @@ -163,6 +165,8 @@ ALL = \ editor$(EXEEXT) \ fast_slow$(EXEEXT) \ file_chooser$(EXEEXT) \ + flex_demo$(EXEEXT) \ + flex_login$(EXEEXT) \ fltk-versions$(EXEEXT) \ fonts$(EXEEXT) \ forms$(EXEEXT) \ @@ -420,6 +424,10 @@ file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME) $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) $(OSX_ONLY) ../fltk-config --post $@ +flex_demo$(EXEEXT): flex_demo.o + +flex_login$(EXEEXT): flex_login.o + fltk-versions$(EXEEXT): fltk-versions.o fonts$(EXEEXT): fonts.o -- cgit v1.2.3