diff options
| author | Matthias Melcher <github@matthiasm.com> | 2023-10-26 00:38:58 +0200 |
|---|---|---|
| committer | Matthias Melcher <github@matthiasm.com> | 2023-10-26 00:39:10 +0200 |
| commit | 6d5021c00e71db7d0bc36c8622cb256fd5088cd6 (patch) | |
| tree | 5074e3fe2e28e481ce183219e0de8d61f1bb0e72 /fluid/file.cxx | |
| parent | 06d12892f90233c4ec50109fc2d2f06c5ae14432 (diff) | |
FLUID: Adds initial MergeBack feature.
Diffstat (limited to 'fluid/file.cxx')
| -rw-r--r-- | fluid/file.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fluid/file.cxx b/fluid/file.cxx index fdfc203a7..5af4d7404 100644 --- a/fluid/file.cxx +++ b/fluid/file.cxx @@ -333,6 +333,11 @@ void Fd_Project_Reader::read_children(Fl_Type *p, int paste, Strategy strategy, } goto CONTINUE; } + + if (!strcmp(c, "mergeback")) { + g_project.write_mergeback_data = read_int(); + goto CONTINUE; + } } { Fl_Type *t = add_new_widget_from_file(c, strategy); @@ -808,6 +813,8 @@ int Fd_Project_Writer::write_project(const char *filename, int selected_only, bo g_layout_list.write(this); if (g_shell_config) g_shell_config->write(this); + if (g_project.write_mergeback_data) + write_string("\nmergeback %d", g_project.write_mergeback_data); } for (Fl_Type *p = Fl_Type::first; p;) { |
