brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix dropping window on the indicators and at the screen edge for "+"

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=607821
This commit is contained in:
Maxim Ermilov 2010-03-17 02:21:24 +03:00
parent ee57dab846
commit e9a9a5243c
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/ui/workspacesView.js
View File

@ -774,6 +774,22 @@ SingleView.prototype = {
}, },
acceptDrop: function(source, dropActor, x, y, time) { acceptDrop: function(source, dropActor, x, y, time) {
if (x < this._x || y < this._y || y > this._y + this._height) {
this._dropGroup.lower_bottom();
dropActor.hide();
let target = global.stage.get_actor_at_pos(Clutter.PickMode.ALL, x, y);
dropActor.show();
if (target._delegate && target._delegate != this && target._delegate.acceptDrop) {
let [targX, targY] = target.get_transformed_position();
return target._delegate.acceptDrop(source, dropActor,
(x - targX) / target.scale_x,
(y - targY) / target.scale_y,
time);
}
return false;
}
for (let i = 0; i < this._workspaces.length; i++) { for (let i = 0; i < this._workspaces.length; i++) {
let [dx, dy] = this._workspaces[i].actor.get_transformed_position(); let [dx, dy] = this._workspaces[i].actor.get_transformed_position();
let [dw, dh] = this._workspaces[i].actor.get_transformed_size(); let [dw, dh] = this._workspaces[i].actor.get_transformed_size();
@ -784,7 +800,7 @@ SingleView.prototype = {
let [dx, dy] = this._newWorkspaceArea.actor.get_transformed_position(); let [dx, dy] = this._newWorkspaceArea.actor.get_transformed_position();
let [dw, dh] = this._newWorkspaceArea.actor.get_transformed_size(); let [dw, dh] = this._newWorkspaceArea.actor.get_transformed_size();
if (x > dx && x < dx + dw && y > dy && y < dy + dh) if (x > dx && y > dy && y < dy + dh)
return this._acceptNewWorkspaceDrop(source, dropActor, x, y, time); return this._acceptNewWorkspaceDrop(source, dropActor, x, y, time);
return false; return false;
@ -822,7 +838,7 @@ SingleView.prototype = {
let [dx, dy] = this._newWorkspaceArea.actor.get_transformed_position(); let [dx, dy] = this._newWorkspaceArea.actor.get_transformed_position();
let [dw, dh] = this._newWorkspaceArea.actor.get_transformed_size(); let [dw, dh] = this._newWorkspaceArea.actor.get_transformed_size();
this._newWorkspaceArea.setStyle(x > dx && x < dx + dw && y > dy && y < dy + dh); this._newWorkspaceArea.setStyle(x > dx && y > dy && y < dy + dh);
[dx, dy] = this._leftShadow.get_transformed_position(); [dx, dy] = this._leftShadow.get_transformed_position();
[dw, dh] = this._leftShadow.get_transformed_size(); [dw, dh] = this._leftShadow.get_transformed_size();