From 160832ce04f932fbb3df199aa01d1c93148bb292 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Sat, 11 Dec 2021 19:43:00 +0100 Subject: STR 3442: copy/paste now inserts widget as expected. Fluid would add pasted widgets as the last child of the current group, even if they were cut at the beginning of the group. This patch adds a 'startegy' to adding widgets to allow merging closer to the 'current' widget. Also added d'n'd for the widget bin and some other UI improvements. STR 3442: some preparation, variable renaming STR 3442: unifying functions to add widgets. Adding widgets interactively is merged into one function, making undo/redo work as expected and removing unexpected differences between adding by menu or bin. STR 3442: adding drag'n'drop for windows from bin. Just drag the window symbol out of the tree and drop it anywhere on the desktop. Visual representation of dragged Window. STR 3442: insert individual nodes after 'current' STR 3442: adding new widget at expected positions. The widget bin can finally do drag'n'drop. Widgets appear in the tree close to the last selection. Duplicating now ads right below. Cut and paste inserts after last selection. Fluid: replaced #define with strict enum type. --- fluid/Fl_Window_Type.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fluid/Fl_Window_Type.h') diff --git a/fluid/Fl_Window_Type.h b/fluid/Fl_Window_Type.h index 5868e2576..97d5779aa 100644 --- a/fluid/Fl_Window_Type.h +++ b/fluid/Fl_Window_Type.h @@ -68,7 +68,7 @@ public: Fl_Window_Type() { drag = dx = dy = 0; sr_min_w = sr_min_h = sr_max_w = sr_max_h = 0; } uchar modal, non_modal; - Fl_Type *make(); + Fl_Type *make(Strategy strategy); virtual const char *type_name() {return "Fl_Window";} virtual const char *alt_type_name() {return "fltk::Window";} @@ -116,7 +116,7 @@ public: void write_code1(); void write_code2(); - Fl_Type *make(); + Fl_Type *make(Strategy strategy); virtual const char *type_name() {return "widget_class";} int pixmapID() { return 48; } int is_parent() const {return 1;} -- cgit v1.2.3