appDisplay: Check 'app-picker-layout' to make icons draggable

Now we drag not only to the Dash, but also to the icon grid itself,
so make the app icon draggable only when either one or the other is
writable.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1284
This commit is contained in:
Georges Basile Stavracas Neto 2020-07-16 11:15:03 -03:00 committed by Florian Müllner
parent 40de201056
commit d04d6e069d

View File

@ -843,7 +843,9 @@ class AppDisplay extends BaseAppView {
// at least on single-monitor setups. // at least on single-monitor setups.
// This also disables drag-to-launch on multi-monitor setups, // This also disables drag-to-launch on multi-monitor setups,
// but we hope that is not used much. // but we hope that is not used much.
let favoritesWritable = global.settings.is_writable('favorite-apps'); const isDraggable =
global.settings.is_writable('favorite-apps') ||
global.settings.is_writable('app-picker-layout');
apps.forEach(appId => { apps.forEach(appId => {
if (appsInsideFolders.has(appId)) if (appsInsideFolders.has(appId))
@ -853,9 +855,7 @@ class AppDisplay extends BaseAppView {
if (!icon) { if (!icon) {
let app = appSys.lookup_app(appId); let app = appSys.lookup_app(appId);
icon = new AppIcon(app, { icon = new AppIcon(app, { isDraggable });
isDraggable: favoritesWritable,
});
} }
appIcons.push(icon); appIcons.push(icon);