diff options
| author | Matthias Melcher <github@matthiasm.com> | 2023-03-18 17:33:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-18 17:33:27 +0100 |
| commit | 5c482f9d9b357e098f955351f425bc985254ff28 (patch) | |
| tree | c410588ac915886aea4bef3478a12d682bb5ad9f /fluid/fluid.h | |
| parent | a9fb6a979fbcf31c2405d61ea720879bd5507d02 (diff) | |
Fix and update alignment #346 (#701)
* interactive layout alignment rewritten
* interface for new alignment rules
* new alignment dialog box
* user defined layout rules added
* layout rules can be stored in projects, settings, and external files
* Valgrind verification
Diffstat (limited to 'fluid/fluid.h')
| -rw-r--r-- | fluid/fluid.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/fluid/fluid.h b/fluid/fluid.h index 7d2a3ade2..c952558df 100644 --- a/fluid/fluid.h +++ b/fluid/fluid.h @@ -1,7 +1,7 @@ // // FLUID main entry for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2021 by Bill Spitzak and others. +// Copyright 1998-2023 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -42,9 +42,6 @@ extern Fl_Menu_Item Main_Menu[]; extern Fl_Menu_Bar *main_menubar; extern Fl_Window *main_window; -extern int gridx; -extern int gridy; -extern int snap; extern int show_guides; extern int show_comments; @@ -65,6 +62,9 @@ extern Fl_Menu_Item *history_item; extern Fl_Menu_Item *widgetbin_item; extern Fl_Menu_Item *sourceview_item; extern Fl_Menu_Item *overlay_item; +extern Fl_Button *overlay_button; +extern Fl_Menu_Item *guides_item; +extern Fl_Button *guides_button; extern int modflag; @@ -77,6 +77,7 @@ extern int compile_strings; // fluic -cs extern int batch_mode; extern int pasteoffset; +extern int pasteoffset; // ---- project settings @@ -133,7 +134,9 @@ extern void new_from_template_cb(Fl_Widget *w, void *v); extern int write_code_files(); extern void write_strings_cb(Fl_Widget *, void *); extern void align_widget_cb(Fl_Widget *, long); -extern void widget_size_cb(Fl_Widget *, long); extern void toggle_widgetbin_cb(Fl_Widget *, void *); +inline int fd_min(int a, int b) { return (a < b ? a : b); } +inline int fd_min(int a, int b, int c) { return fd_min(a, fd_min(b, c)); } + #endif // _FLUID_FLUID_H |