[gnome-maps] mainWindow: Remove can_focus flag from Overlay



commit 6e07fc4f1be3b38fc70fcf191f211ca60b95d4c7
Author: Jonas Danielsson <jonas danielsson threetimestwo org>
Date:   Mon Oct 20 05:20:49 2014 -0400

    mainWindow: Remove can_focus flag from Overlay
    
    Instead allow the GtkChamplainEmbed MapView to have focus.
    This is needed to propagate events to the ChamplainView.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=737774

 src/application.js |    2 +-
 src/mainWindow.js  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/application.js b/src/application.js
index e1fa2dd..452767d 100644
--- a/src/application.js
+++ b/src/application.js
@@ -154,7 +154,7 @@ const Application = new Lang.Class({
             return;
 
         Gtk.IconTheme.get_default().append_search_path(Path.ICONS_DIR);
-        let overlay = new Gtk.Overlay({ visible: true, can_focus: true });
+        let overlay = new Gtk.Overlay({ visible: true, can_focus: false });
         notificationManager = new NotificationManager.NotificationManager(overlay);
         this._mainWindow = new MainWindow.MainWindow(this, overlay);
         this._mainWindow.window.connect('destroy', this._onWindowDestroy.bind(this));
diff --git a/src/mainWindow.js b/src/mainWindow.js
index cc0b8ea..c0ecd29 100644
--- a/src/mainWindow.js
+++ b/src/mainWindow.js
@@ -109,7 +109,7 @@ const MainWindow = new Lang.Class({
 
         let popover = placeEntry.popover;
         popover.connect('selected',
-                        this._overlay.grab_focus.bind(this._overlay));
+                        this.mapView.grab_focus.bind(this.mapView));
         this.mapView.view.connect('button-press-event',
                                   popover.hide.bind(popover));
         return placeEntry;
@@ -200,7 +200,7 @@ const MainWindow = new Lang.Class({
         this.window.connect('window-state-event',
                             this._onWindowStateEvent.bind(this));
         this.mapView.view.connect('button-press-event',
-                                  this._overlay.grab_focus.bind(this._overlay));
+                                  this.mapView.grab_focus.bind(this.mapView));
 
         this.window.application.connect('notify::connected', (function() {
             if(this.window.application.connected)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]