diff options
| author | Matthias Melcher <github@matthiasm.com> | 2023-10-22 20:25:41 +0200 |
|---|---|---|
| committer | Matthias Melcher <github@matthiasm.com> | 2023-10-22 20:25:50 +0200 |
| commit | bf62959f1f76a5bafd3566a802b49fc2138a4763 (patch) | |
| tree | 4cfe161bcaae3be36904c3f7413d07813db21205 /fluid/widget_panel.h | |
| parent | 1209e9dcd7e1e97bedc747d06ba4eea837562158 (diff) | |
FLUID: New layout of Grid tab.
Diffstat (limited to 'fluid/widget_panel.h')
| -rw-r--r-- | fluid/widget_panel.h | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/fluid/widget_panel.h b/fluid/widget_panel.h index 723a73b37..a412f5b98 100644 --- a/fluid/widget_panel.h +++ b/fluid/widget_panel.h @@ -21,6 +21,9 @@ #include <FL/Fl.H> #include "custom_widgets.h" #include <FL/Fl_Double_Window.H> +#include <FL/Fl_Grid.H> +#include <FL/Fl_Button.H> +Fl_Double_Window* make_window(); #include <FL/Fl_Tabs.H> extern Fl_Tabs *widget_tabs; #include <FL/Fl_Group.H> @@ -31,7 +34,6 @@ extern void label_cb(Fl_Input*, void*); extern Fl_Menu_Item labeltypemenu[]; extern void labeltype_cb(Fl_Choice*, void*); extern void image_cb(Fl_Input*, void*); -#include <FL/Fl_Button.H> extern void image_browse_cb(Fl_Button*, void*); #include "pixmaps.h" extern void compress_image_cb(Fl_Button*, void*); @@ -134,32 +136,24 @@ extern void when_cb(Fl_Menu_Button*, void*); #include <FL/Fl_Input_Choice.H> extern void user_data_type_cb(Fl_Input_Choice*, void*); extern Fl_Box *w_when_box; -extern Fl_Tabs *widget_tabs_repo; extern Fl_Group *widget_tab_grid_child; extern void grid_set_row_cb(Fluid_Coord_Input*, void*); extern Fluid_Coord_Input *widget_grid_row_input; extern void grid_set_col_cb(Fluid_Coord_Input*, void*); extern Fluid_Coord_Input *widget_grid_col_input; extern void grid_align_cb(Fl_Choice*, void*); -extern void grid_set_rowspan_cb(Fluid_Coord_Input*, void*); -extern void grid_set_colspan_cb(Fluid_Coord_Input*, void*); extern void grid_set_min_wdt_cb(Fluid_Coord_Input*, void*); extern void grid_set_min_hgt_cb(Fluid_Coord_Input*, void*); +extern void grid_set_rowspan_cb(Fluid_Coord_Input*, void*); +extern void grid_set_colspan_cb(Fluid_Coord_Input*, void*); extern Fl_Group *widget_tab_grid; -extern void grid_row_height(Fluid_Coord_Input*, void*); -extern void grid_row_weight(Fluid_Coord_Input*, void*); -extern void grid_row_gap(Fluid_Coord_Input*, void*); -extern void grid_col_width(Fluid_Coord_Input*, void*); -extern void grid_col_weight(Fluid_Coord_Input*, void*); -extern void grid_col_gap(Fluid_Coord_Input*, void*); -extern void grid_margin_left_cb(Fl_Value_Input*, void*); -extern void grid_margin_top_cb(Fl_Value_Input*, void*); -extern void grid_margin_right_cb(Fl_Value_Input*, void*); -extern void grid_margin_bottom_cb(Fl_Value_Input*, void*); -extern void grid_row_gap_cb(Fl_Value_Input*, void*); -extern void grid_col_gap_cb(Fl_Value_Input*, void*); -extern void grid_rows_cb(Fluid_Coord_Input*, void*); -extern void grid_cols_cb(Fluid_Coord_Input*, void*); +extern Fluid_Coord_Input *widget_grid_rows; +extern Fluid_Coord_Input *widget_grid_cols; +extern Fluid_Coord_Input *widget_grid_curr_row; +extern Fl_Group *widget_grid_curr_row_attributes; +extern Fluid_Coord_Input *widget_grid_curr_col; +extern Fl_Group *widget_grid_curr_col_attributes; +extern Fl_Tabs *widget_tabs_repo; extern void live_mode_cb(Fl_Button*, void*); extern Fl_Button *wLiveMode; extern void overlay_cb(Fl_Button*, void*); @@ -173,5 +167,5 @@ extern Fl_Menu_Item menu_Children[]; extern Fl_Menu_Item menu_2[]; extern Fl_Menu_Item menu_3[]; extern Fl_Menu_Item menu_4[]; -extern Fl_Menu_Item menu_Align[]; +extern Fl_Menu_Item menu_5[]; #endif |