jenna
/
gnome-shell-extension-openweather
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not use deprecated popup-function, fixes #206.

Browse Source 
Instead of logging a warning, that the GtkMenu.popup function is deprecated since 3.22 and should not be used in new code, they just disabled it (in 3.22) and break code.
merge-requests/218/head
Jens Lody 7 years ago
parent 8291339135
commit 21f82996a5
1 changed files with 6 additions and 11 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 17
      src/prefs.js

17
src/prefs.js
Unescape View File

@ -30,6 +30,7 @@
* *
*/ */
const Gtk = imports.gi.Gtk; const Gtk = imports.gi.Gtk;
const Gdk = imports.gi.Gdk;
const GObject = imports.gi.GObject; const GObject = imports.gi.GObject;
const Gettext = imports.gettext.domain('gnome-shell-extension-openweather'); const Gettext = imports.gettext.domain('gnome-shell-extension-openweather');
const _ = Gettext.gettext; const _ = Gettext.gettext;
@ -185,7 +186,7 @@ const WeatherPrefsWidget = new GObject.Class({
this.searchMenu.append(item); this.searchMenu.append(item);
this.searchMenu.show_all(); this.searchMenu.show_all();
this.searchMenu.popup(null, null, Lang.bind(this, this.placeSearchMenu), 0, this.searchName); this.searchMenu.popup_at_widget(this.searchName, Gdk.Gravity.SOUTH_WEST, Gdk.Gravity.NORTH_WEST, null);
if (this.geolocation_provider == GeolocationProvider.OPENSTREETMAPS) { if (this.geolocation_provider == GeolocationProvider.OPENSTREETMAPS) {
let params = { let params = {
@ -225,7 +226,7 @@ const WeatherPrefsWidget = new GObject.Class({
} }
} }
this.searchMenu.show_all(); this.searchMenu.show_all();
this.searchMenu.popup(null, null, Lang.bind(this, this.placeSearchMenu), 0, this.searchName); this.searchMenu.popup_at_widget(this.searchName, Gdk.Gravity.SOUTH_WEST, Gdk.Gravity.NORTH_WEST, null);
return 0; return 0;
})); }));
} else if (this.geolocation_provider == GeolocationProvider.MAPQUEST) { } else if (this.geolocation_provider == GeolocationProvider.MAPQUEST) {
@ -240,7 +241,7 @@ const WeatherPrefsWidget = new GObject.Class({
}); });
this.searchMenu.append(item); this.searchMenu.append(item);
this.searchMenu.show_all(); this.searchMenu.show_all();
this.searchMenu.popup(null, null, Lang.bind(this, this.placeSearchMenu), 0, this.searchName); this.searchMenu.popup_at_widget(this.searchName, Gdk.Gravity.SOUTH_WEST, Gdk.Gravity.NORTH_WEST, null);
return 0; return 0;
} }
let params = { let params = {
@ -289,7 +290,7 @@ const WeatherPrefsWidget = new GObject.Class({
} }
} }
this.searchMenu.show_all(); this.searchMenu.show_all();
this.searchMenu.popup(null, null, Lang.bind(this, this.placeSearchMenu), 0, this.searchName); this.searchMenu.popup_at_widget(this.searchName, Gdk.Gravity.SOUTH_WEST, Gdk.Gravity.NORTH_WEST, null);
return 0; return 0;
})); }));
} else if (this.geolocation_provider == GeolocationProvider.GEOCODE) { } else if (this.geolocation_provider == GeolocationProvider.GEOCODE) {
@ -338,7 +339,7 @@ const WeatherPrefsWidget = new GObject.Class({
} }
this.searchMenu.show_all(); this.searchMenu.show_all();
this.searchMenu.popup(null, null, Lang.bind(this, this.placeSearchMenu), 0, this.searchName); this.searchMenu.popup_at_widget(this.searchName, Gdk.Gravity.SOUTH_WEST, Gdk.Gravity.NORTH_WEST, null);
return 0; return 0;
})); }));
} }
@ -423,12 +424,6 @@ const WeatherPrefsWidget = new GObject.Class({
this.searchName.set_text(arguments[0].get_label()); this.searchName.set_text(arguments[0].get_label());
}, },
placeSearchMenu: function() {
let[gx, gy, gw, gh] = this.searchName.get_window().get_geometry();
let[px, py] = this.searchName.get_window().get_position();
return [gx + px, gy + py + this.searchName.get_allocated_height()];
},
clearSearchMenu: function() { clearSearchMenu: function() {
let children = this.searchMenu.get_children(); let children = this.searchMenu.get_children();
for (let i in children) { for (let i in children) {

Write Preview
Loading…
Cancel
Save