Add option to merge cell text

aardappel · Oct 11, 2023 · 9f42183 · 9f42183
1 parent dea9fee
commit 9f42183
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/src/document.h b/src/document.h
@@ -919,7 +919,12 @@ struct Document {
                     } else {  // prevent Ctrl+H from being treated as Backspace
                         break;
                     }
-                case WXK_RETURN: return Action(dc, shift ? A_ENTERGRID : A_ENTERCELL);
+                case WXK_RETURN: 
+                    if (!ctrl) { 
+                        return Action(dc, shift ? A_ENTERGRID : A_ENTERCELL);
+                    } else { // prevent Ctrl+M from being treated as Return
+                        break;
+                    }
                 case WXK_ESCAPE:  // docs say it can be used as a menu accelerator, but it does not
                                   // trigger from there?
                     return Action(dc, A_CANCELEDIT);
@@ -1435,6 +1440,22 @@ struct Document {
                 }
                 return nullptr;
 
+            case A_MERGE: {
+                if (selected.xs * selected.ys == 1) return nullptr;
+                auto fc = selected.GetFirst();
+                fc->parent->AddUndo(this);
+                loopallcellssel(ci, false) {
+                    if (ci != fc) {
+                        fc->text.t += " " + ci->text.t;
+                        ci->text.t.Clear();
+                    }
+                    ci->ResetChildren();
+                    ci->ResetLayout();
+                }
+                Refresh();
+                return nullptr;
+            }
+
             case A_SELALL:
                 selected.SelAll();
                 Refresh();

diff --git a/src/main.cpp b/src/main.cpp
@@ -49,6 +49,7 @@ enum {
     A_CUT,
     A_COPY,
     A_PASTE,
+    A_MERGE,
     A_NEWGRID,
     A_UNDO,
     A_ABOUT,

diff --git a/src/myframe.h b/src/myframe.h
@@ -388,6 +388,7 @@ struct MyFrame : wxFrame {
             MyAppend(editmenu, A_PASTE, _(L"&Paste\tCTRL+v"));
             MyAppend(editmenu, A_PASTESTYLE, _(L"Paste Style Only\tCTRL+SHIFT+v"),
                      _(L"only sets the colors and style of the copied cell, and keeps the text"));
+            MyAppend(editmenu, A_MERGE, _("&Merge Text\tCTRL+m"));
             editmenu->AppendSeparator();
             MyAppend(editmenu, A_UNDO, _(L"&Undo\tCTRL+z"), _(L"revert the changes, one step at a time"));
             MyAppend(editmenu, A_REDO, _(L"&Redo\tCTRL+y"),