← Back to branch summary

~jeremywootten/pantheon-files/pantheon-files-SE

« back to all changes in this revision

Viewing changes to src/View/Window.vala

Merge fix-798470-merge-files-to-folder-by-drag-drop

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/View/Window.vala
764
764
            if (doing_undo_redo) { /* Guard against rapid pressing of Ctrl-Z */
765
765
                return;
766
766
            }
 
767
 
767
768
            before_undo_redo ();
768
769
            undo_manager.undo (this, after_undo_redo);
769
770
        }
779
780
        private void before_undo_redo () {
780
781
            doing_undo_redo = true;
781
782
            update_undo_actions ();
 
783
            current_tab.is_frozen = true;
782
784
        }
783
785
 
784
786
        public static void after_undo_redo (void  *data) {
787
789
                window.current_tab.reload ();
788
790
 
789
791
            window.doing_undo_redo = false;
 
792
            window.current_tab.is_frozen = false;
790
793
        }
791
794
 
792
795
        private void change_state_select_all (GLib.SimpleAction action) {
799
802
            }
800
803
        }
801
804
 
802
 
 
803
805
        public void change_state_show_hidden (GLib.SimpleAction action) {
804
806
            bool state = !action.state.get_boolean ();
805
807
            action.set_state (new GLib.Variant.boolean (state));