Fluid: Improve UID generation.

MatthiasWM · Dec 28, 2024 · c1f4134 · c1f4134
1 parent efb4e17
commit c1f4134
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/fluid/Fl_Type.cxx b/fluid/Fl_Type.cxx
@@ -703,8 +703,9 @@ void Fl_Type::add(Fl_Type *anchor, Strategy strategy) {
   }
 
 #ifdef FLUID_OPTION_MERGEBACK
+  if (   g_project.write_mergeback_data
+      && strategy.source() == Strategy::FROM_USER)
   { // make sure that we have no duplicate uid's
-    // FIXME: if 'add' is called while loading a file, the UID will be set by the tag later
     Fl_Type *tp = this;
     do {
       tp->set_uid(tp->uid_);
@@ -759,7 +760,7 @@ void Fl_Type::insert(Fl_Type *g) {
   g->prev = end;
   update_visibility_flag(this);
 #ifdef FLUID_OPTION_MERGEBACK
-  { // make sure that we have no duplicate uid's
+  if (g_project.write_mergeback_data) { // make sure that we have no duplicate uid's
     Fl_Type *tp = this;
     do {
       tp->set_uid(tp->uid_);

diff --git a/fluid/file.cxx b/fluid/file.cxx
@@ -384,6 +384,8 @@ Fl_Type *Fd_Project_Reader::read_children(Fl_Type *p, int merge, Strategy strate
       if (!cc || !strcmp(cc,"}")) break;
       t->read_property(*this, cc);
     }
+    if (g_project.write_mergeback_data && t->get_uid()==0)
+      t->set_uid(0);
 
     if (t->can_have_children()) {
       c = read_word(1);