diff options
| author | Matthias Melcher <github@matthiasm.com> | 2022-11-01 13:30:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-01 13:30:05 +0100 |
| commit | 93ea93ee2b424ded25358d87529b1160cdb4f80c (patch) | |
| tree | a0a445a21ac71c72e4983a5ed8bf854a70dec3a8 /fluid/pixmaps.cxx | |
| parent | 31ec6f623ab76d3f1107af9782237b8d7a089026 (diff) | |
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 <albrechts.fltk@online.de>
Diffstat (limited to 'fluid/pixmaps.cxx')
| -rw-r--r-- | fluid/pixmaps.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fluid/pixmaps.cxx b/fluid/pixmaps.cxx index 58e887999..b79314e36 100644 --- a/fluid/pixmaps.cxx +++ b/fluid/pixmaps.cxx @@ -77,6 +77,7 @@ #include "pixmaps/flInputChoice.xpm" #include "pixmaps/flCheckMenuitem.xpm" #include "pixmaps/flRadioMenuitem.xpm" +#include "pixmaps/flFlex.xpm" Fl_Pixmap *lock_pixmap; Fl_Pixmap *protected_pixmap; @@ -137,8 +138,9 @@ Fl_Pixmap *simple_terminal_pixmap; Fl_Pixmap *input_choice_pixmap; Fl_Pixmap *check_menuitem_pixmap; Fl_Pixmap *radio_menuitem_pixmap; +Fl_Pixmap *flex_pixmap; -Fl_Pixmap *pixmap[56]; +Fl_Pixmap *pixmap[57]; void loadPixmaps() { @@ -211,5 +213,7 @@ void loadPixmaps() pixmap[53] = input_choice_pixmap = new Fl_Pixmap(flInputChoice_xpm); input_choice_pixmap->scale(16, 16); pixmap[54] = check_menuitem_pixmap = new Fl_Pixmap(flCheckMenuitem_xpm); check_menuitem_pixmap->scale(16, 16); pixmap[55] = radio_menuitem_pixmap = new Fl_Pixmap(flRadioMenuitem_xpm); radio_menuitem_pixmap->scale(16, 16); + + pixmap[56] = flex_pixmap = new Fl_Pixmap(flFlex_xpm); flex_pixmap->scale(16, 16); } |