diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2022-11-24 19:00:00 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2022-11-25 00:00:48 +0100 |
| commit | b1ba37c5ba1df543baa87d328805af34da4bd2b1 (patch) | |
| tree | 01d6ff63843cd9ed1f58fd2ab201f462bf11a385 /fluid | |
| parent | 40f376a6f707e6c5ae69c0f73300575bd79e28e3 (diff) | |
Add "Oxy" scheme (STR 2675, STR 3477)
This commit is similar to the patch given in STR 3477, oxy_v5.diff:
https://www.fltk.org/strfiles/3477/oxy_v5.diff
... with modifications, and updated to current FLTK code.
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/Fl_Widget_Type.cxx | 12 | ||||
| -rw-r--r-- | fluid/alignment_panel.cxx | 1 | ||||
| -rw-r--r-- | fluid/alignment_panel.fl | 4 | ||||
| -rw-r--r-- | fluid/fluid.cxx | 3 |
4 files changed, 20 insertions, 0 deletions
diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx index e933ad6d7..dc87cb871 100644 --- a/fluid/Fl_Widget_Type.cxx +++ b/fluid/Fl_Widget_Type.cxx @@ -872,6 +872,14 @@ Fl_Menu_Item boxmenu[] = { {"GLEAM_THIN_DOWN_BOX",0,0,(void *)FL_GLEAM_THIN_DOWN_BOX}, {"GLEAM_ROUND_UP_BOX",0,0,(void *)FL_GLEAM_ROUND_UP_BOX}, {"GLEAM_ROUND_DOWN_BOX",0,0,(void *)FL_GLEAM_ROUND_DOWN_BOX}, +{"OXY_UP_BOX",0,0,(void *)FL_OXY_UP_BOX}, +{"OXY_DOWN_BOX",0,0,(void *)FL_OXY_DOWN_BOX}, +{"OXY_THIN_UP_BOX",0,0,(void *)FL_OXY_THIN_UP_BOX}, +{"OXY_THIN_DOWN_BOX",0,0,(void *)FL_OXY_THIN_DOWN_BOX}, +{"OXY_ROUND_UP_BOX",0,0,(void *)FL_OXY_ROUND_UP_BOX}, +{"OXY_ROUND_DOWN_BOX",0,0,(void *)FL_OXY_ROUND_DOWN_BOX}, +{"OXY_BUTTON_UP_BOX",0,0,(void *)FL_OXY_BUTTON_UP_BOX}, +{"OXY_BUTTON_DOWN_BOX",0,0,(void *)FL_OXY_BUTTON_DOWN_BOX}, {0}, {"frames",0,0,0,FL_SUBMENU}, {"UP_FRAME",0,0,(void *)FL_UP_FRAME}, @@ -892,6 +900,10 @@ Fl_Menu_Item boxmenu[] = { {"GTK_THIN_DOWN_FRAME",0,0,(void *)FL_GTK_THIN_DOWN_FRAME}, {"GLEAM_UP_FRAME",0,0,(void *)FL_GLEAM_UP_FRAME}, {"GLEAM_DOWN_FRAME",0,0,(void *)FL_GLEAM_DOWN_FRAME}, +{"OXY_UP_FRAME",0,0,(void *)FL_OXY_UP_FRAME}, +{"OXY_DOWN_FRAME",0,0,(void *)FL_OXY_DOWN_FRAME}, +{"OXY_THIN_UP_FRAME",0,0,(void *)FL_OXY_THIN_UP_FRAME}, +{"OXY_THIN_DOWN_FRAME",0,0,(void *)FL_OXY_THIN_DOWN_FRAME}, {0}, {0}}; diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx index dd0dc4cb6..0253d54c8 100644 --- a/fluid/alignment_panel.cxx +++ b/fluid/alignment_panel.cxx @@ -191,6 +191,7 @@ Fl_Menu_Item menu_scheme_choice[] = { {"Plastic", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0}, {"GTK+", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0}, {"Gleam", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0}, + {"Oxy", 0, 0, 0, 0, (uchar)FL_NORMAL_LABEL, 0, 14, 0}, {0,0,0,0,0,0,0,0,0} }; diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl index 6d1a4782e..45077424a 100644 --- a/fluid/alignment_panel.fl +++ b/fluid/alignment_panel.fl @@ -207,6 +207,10 @@ Function {make_settings_window()} {open label Gleam xywh {20 20 35 25} } + MenuItem {} { + label Oxy + xywh {30 30 35 25} + } } Fl_Group {} {open xywh {20 43 330 161} labelfont 1 align 0 diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index ea8744831..3c695091d 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -1427,6 +1427,9 @@ void scheme_cb(Fl_Choice *, void *) { case 4 : // Gleam Fl::scheme("gleam"); break; + case 5 : // Oxy + Fl::scheme("oxy"); + break; } fluid_prefs.set("scheme", scheme_choice->value()); |