src/Builder4/MainWindow.bjs

src/Builder4/MainWindow.vala

diff --git a/src/Builder4/MainWindow.bjs b/src/Builder4/MainWindow.bjs
index dd0a833..543eae5 100644 (file)
--- a/src/Builder4/MainWindow.bjs
+++ b/src/Builder4/MainWindow.bjs
@@ -65,26 +65,21 @@
            "( ) => {",
            "\t",
            "\tGLib.debug(\"undo clicked\");",
-           "\t",
+           "\tif (_this.windowstate.file.xtype == \"PlainFile\") {",
+           "\t\t_this.codeeditviewbox.view.el.undo();",
+           "\t}",
            "\tif (!_this.windowstate.file.undoStep(-1)) {",
            "\t\treturn;",
            "\t}",
            "\t",
-           "\tif (_this.windowstate.file.xtype == \"PlainFile\") {",
-           "\t\t_this.codeeditviewbox.el.show();",
-           "\t\t_this.windowstate.switchState (WindowState.State.CODEONLY); ",
            "\t ",
-           "\t\t_this.windowstate.code_editor_tab.show(_this.windowstate.file, null, null);",
-           "\t\t ",
-           "\t} else {",
-           "\t",
-           "\t\t_this.windowstate.switchState (WindowState.State.PREVIEW); ",
-           "\t\t// this triggers loadItems..",
-           "\t\t_this.windowstate.left_tree.model.loadFile(",
-           "\t\t\t_this.windowstate.file);",
-           "\t\t ",
+           "\t_this.windowstate.switchState (WindowState.State.PREVIEW); ",
+           "\t// this triggers loadItems..",
+           "\t_this.windowstate.left_tree.model.loadFile(",
+           "\t\t_this.windowstate.file);",
+           "\t ",
            "",
-           "\t}",
+           "\t",
            " ",
            "",
            "\t// load it everywhere",

diff --git a/src/Builder4/MainWindow.vala b/src/Builder4/MainWindow.vala
index c53b1ec..6050efd 100644 (file)
--- a/src/Builder4/MainWindow.vala
+++ b/src/Builder4/MainWindow.vala
@@ -332,26 +332,21 @@ public class Xcls_MainWindow : Object
                        this.el.clicked.connect( ( ) => {
                                
                                GLib.debug("undo clicked");
-                               
+                               if (_this.windowstate.file.xtype == "PlainFile") {
+                                       _this.codeeditviewbox.view.el.undo();
+                               }
                                if (!_this.windowstate.file.undoStep(-1)) {
                                        return;
                                }
                                
-                               if (_this.windowstate.file.xtype == "PlainFile") {
-                                       _this.codeeditviewbox.el.show();
-                                       _this.windowstate.switchState (WindowState.State.CODEONLY); 
                                 
-                                       _this.windowstate.code_editor_tab.show(_this.windowstate.file, null, null);
-                                        
-                               } else {
-                               
-                                       _this.windowstate.switchState (WindowState.State.PREVIEW); 
-                                       // this triggers loadItems..
-                                       _this.windowstate.left_tree.model.loadFile(
-                                               _this.windowstate.file);
-                                        
+                               _this.windowstate.switchState (WindowState.State.PREVIEW); 
+                               // this triggers loadItems..
+                               _this.windowstate.left_tree.model.loadFile(
+                                       _this.windowstate.file);
+                                
                        
-                               }
+                               
                         
                        
                                // load it everywhere