← 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/Widgets/TopMenu.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/Widgets/TopMenu.vala
78
78
                back (1);
79
79
            });
80
80
 
81
 
            key_press_event.connect (on_key_press_event);
82
81
            view_switcher = switcher;
83
82
            view_switcher.margin_end = 20;
84
83
            view_switcher.show_all ();
165
164
            location_bar.with_animation = true;
166
165
        }
167
166
 
168
 
        public bool on_key_press_event (Gdk.EventKey event) {
169
 
            return location_bar.key_press_event (event);
170
 
        }
171
 
 
172
167
        public void cancel () {
173
168
            location_bar.cancel ();
174
169
        }