diff --git a/js/ui/dnd.js b/js/ui/dnd.js index 25769d2c4..f7d6f1a98 100644 --- a/js/ui/dnd.js +++ b/js/ui/dnd.js @@ -234,7 +234,7 @@ const _Draggable = new Lang.Class({ this._dragY = this._dragStartY = stageY; if (this.actor._delegate && this.actor._delegate.getDragActor) { - this._dragActor = this.actor._delegate.getDragActor(this._dragStartX, this._dragStartY); + this._dragActor = this.actor._delegate.getDragActor(); this._dragActor.reparent(Main.uiGroup); this._dragActor.raise_top(); Shell.util_set_hidden_from_pick(this._dragActor, true); diff --git a/js/ui/search.js b/js/ui/search.js index 4b94ba5e0..7ca35af31 100644 --- a/js/ui/search.js +++ b/js/ui/search.js @@ -1,26 +1,10 @@ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- -const Gio = imports.gi.Gio; -const GLib = imports.gi.GLib; const Lang = imports.lang; const Signals = imports.signals; -const Shell = imports.gi.Shell; -const Util = imports.misc.util; - -const FileUtils = imports.misc.fileUtils; -const Main = imports.ui.main; const SEARCH_PROVIDERS_SCHEMA = 'org.gnome.desktop.search-providers'; -// Not currently referenced by the search API, but -// this enumeration can be useful for provider -// implementations. -const MatchType = { - NONE: 0, - SUBSTRING: 1, - PREFIX: 2 -}; - const SearchSystem = new Lang.Class({ Name: 'SearchSystem', diff --git a/js/ui/searchDisplay.js b/js/ui/searchDisplay.js index 08c1c797e..da4769a36 100644 --- a/js/ui/searchDisplay.js +++ b/js/ui/searchDisplay.js @@ -145,7 +145,7 @@ const GridSearchResult = new Lang.Class({ return this._dragActorSource; }, - getDragActor: function(stageX, stageY) { + getDragActor: function() { return this.metaInfo['createIcon'](Main.overview.dashIconSize); }, @@ -231,11 +231,11 @@ const ListSearchResults = new Lang.Class({ const GridSearchResults = new Lang.Class({ Name: 'GridSearchResults', - _init: function(provider, grid) { + _init: function(provider) { this.provider = provider; - this._grid = grid || new IconGrid.IconGrid({ rowLimit: MAX_GRID_SEARCH_RESULTS_ROWS, - xAlign: St.Align.START }); + this._grid = new IconGrid.IconGrid({ rowLimit: MAX_GRID_SEARCH_RESULTS_ROWS, + xAlign: St.Align.START }); this.actor = new St.Bin({ x_align: St.Align.MIDDLE }); this.actor.set_child(this._grid.actor);