← Back to branch summary

~jeremywootten/pantheon-files/fix-1604300-merge-find-functionalities-part1

« back to all changes in this revision

Viewing changes to src/View/Window.vala

  • Committer: Jeremy Wootten
  • Date: 2017-01-13 13:31:06 UTC
  • mfrom: (2412.1.32 pantheon-files)
  • Revision ID: jeremy@elementaryos.org-20170113133106-v9l164ms13lh3p0a
Merge trunk to r2444 and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/View/Window.vala
259
259
            undo_manager.request_menu_update.connect (undo_redo_menu_update_callback);
260
260
            button_press_event.connect (on_button_press_event);
261
261
 
262
 
            /* Top menu captures keystrokes if pathbar has focus, otherwise returns false so
263
 
             * they can trigger window actions or get passed to the view */
264
 
            key_press_event.connect ((event) => {
265
 
                if (top_menu.key_press_event (event)) {
266
 
                    return true;
267
 
                } else {
268
 
                    return current_tab.key_press_event (event);
269
 
                }
270
 
            });
271
 
 
272
262
            window_state_event.connect ((event) => {
273
263
                if ((bool) event.changed_mask & Gdk.WindowState.MAXIMIZED) {
274
264
                    Preferences.settings.set_boolean("maximized",
532
522
 
533
523
            top_menu.enter_search_mode ();
534
524
        }
535
 
        public void on_search_request (Gdk.EventKey event) {
536
 
            if (current_tab == null || current_tab.is_frozen) {
537
 
                return;
538
 
            }
539
 
 
540
 
            if (top_menu.enter_search_mode ()) {
541
 
                top_menu.on_key_press_event (event);
542
 
            }
543
 
        }
544
525
 
545
526
        private bool adding_window = false;
546
527
        private void action_new_window (GLib.SimpleAction action, GLib.Variant? param) {