[gnome-shell/gbsneto/icon-grid-part2: 7/10] allView: Remove icon from folder when dropping outside
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/gbsneto/icon-grid-part2: 7/10] allView: Remove icon from folder when dropping outside
- Date: Wed, 31 Jul 2019 15:45:59 +0000 (UTC)
commit 5a8b66536bde05ccd489c752e4da7c282dce2c4e
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Sat Jun 29 01:26:08 2019 -0300
allView: Remove icon from folder when dropping outside
When dropping an app icon to outside the folder, remove the
app from that folder. GNOME Shell is already smart enough
to figure out the setting changes and update the icons.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/603
js/ui/appDisplay.js | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
---
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 8fd6cd587..3e4a15457 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -731,6 +731,38 @@ var AllView = class AllView extends BaseAppView {
}
}
+ _canDropAt(source) {
+ if (!(source instanceof AppIcon))
+ return false;
+
+ if (!global.settings.is_writable('favorite-apps'))
+ return false;
+
+ if (!(source.view instanceof FolderView))
+ return false;
+
+ return true;
+ }
+
+ handleDragOver(source, actor, x, y, time) {
+ if (!this._canDropAt(source))
+ return DND.DragMotionResult.NO_DROP;
+
+ return DND.DragMotionResult.MOVE_DROP;
+ }
+
+ acceptDrop(source, actor, x, y, time) {
+ if (!this._canDropAt(source))
+ return false;
+
+ source.view.removeApp(source.app);
+
+ if (this._currentPopup)
+ this._currentPopup.popdown();
+
+ return true;
+ }
+
inhibitEventBlocker() {
this._nEventBlockerInhibits++;
this._eventBlocker.visible = this._nEventBlockerInhibits == 0;
@@ -1248,6 +1280,19 @@ var FolderView = class FolderView extends BaseAppView {
return apps;
}
+
+ removeApp(app) {
+ let folderApps = this._folder.get_strv('apps');
+ let index = folderApps.indexOf(app.id);
+ if (index < 0)
+ return false;
+
+ folderApps.splice(index, 1);
+
+ this._folder.set_strv('apps', folderApps);
+
+ return true;
+ }
};
var FolderIcon = class FolderIcon {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]