1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635
|
const { Clutter, GLib, GObject, Graphene, Meta, Shell, St } = imports.gi;
const AppDisplay = imports.ui.appDisplay;
const AppFavorites = imports.ui.appFavorites;
const DND = imports.ui.dnd;
const IconGrid = imports.ui.iconGrid;
const Main = imports.ui.main;
const Overview = imports.ui.overview;
const Dash = imports.ui.dash;
const { DashIcon, DashItemContainer, getAppFromSource, DragPlaceholderItem } = imports.ui.dash;
const Self = imports.misc.extensionUtils.getCurrentExtension();
const Util = Self.imports.util;
var DASH_ANIMATION_TIME = 200;
var DASH_ITEM_LABEL_SHOW_TIME = 150;
var DASH_ITEM_LABEL_HIDE_TIME = 100;
var DASH_ITEM_HOVER_TIMEOUT = 300;
const baseIconSizes = [16, 22, 24, 32, 48, 64];
function override() {
Util.bindSetting('override-dash', (settings, label) => {
if (settings.get_boolean(label)) {
global.vertical_overview.GSFunctions['Dash'] = Util.overrideProto(Dash.Dash.prototype, DashOverride);
global.vertical_overview.GSFunctions['DashItemContainer'] = Util.overrideProto(Dash.DashItemContainer.prototype, DashItemContainerOverride);
set_to_vertical();
Util.bindSetting('dash-max-height', dash_max_height);
Util.bindSetting('hide-dash', hide_dash);
Util.bindSetting('show-apps-on-top', show_apps_on_top);
Util.bindSetting('dash-max-icon-size', dash_max_icon_size);
Util.bindSetting('custom-run-indicator', custom_run_indicator);
Util.bindSetting('dash-move-labels', dash_move_labels);
global.vertical_overview.dash_override = true;
} else {
reset(false);
}
});
}
function reset(isDisable) {
if (global.vertical_overview.dash_override) {
set_to_horizontal();
Util.overrideProto(Dash.Dash.prototype, global.vertical_overview.GSFunctions['Dash']);
Util.overrideProto(Dash.DashItemContainer.prototype, global.vertical_overview.GSFunctions['DashItemContainer']);
global.vertical_overview.dash_override = false;
this.translation_x = 0;
Util.unbindSetting('dash-max-height', () => {
delete Main.overview._overview._controls.dashMaxHeightScale;
});
Util.unbindSetting('hide-dash', (settings, label) => {
if (settings.get_boolean(label))
Main.overview._overview._controls.dash.show();
});
Util.unbindSetting('show-apps-on-top', () => {
let dash = Main.overview._overview._controls.dash;
dash._dashContainer.set_child_at_index(dash._showAppsIcon, 1);
});
Util.unbindSetting('dash-max-icon-size', () => {
delete Main.overview._overview._controls.dash.maxIconSizeOverride;
});
Util.unbindSetting('custom-run-indicator', () => {
delete Main.overview._overview._controls.dash.customRunIndicatorEnabled;
});
Util.unbindSetting('dash-move-labels', () => {
delete global.vertical_overview.dash_move_labels;
});
}
// override-dash shouldn't be unbound unless the extension is disabled,
// otherwise it can't be re-enabled without restarting the extension
if (isDisable)
Util.unbindSetting('override-dash');
}
function set_to_vertical() {
let dash = Main.overview._overview._controls.dash;
global.vertical_overview.dash_workId = dash._workId;
dash._workId = Main.initializeDeferredWork(dash._box, dash._redisplay.bind(dash));
dash._box.layout_manager.orientation = Clutter.Orientation.VERTICAL;
dash._dashContainer.layout_manager.orientation = Clutter.Orientation.VERTICAL;
dash._dashContainer.y_expand = false;
dash._dashContainer.x_expand = true;
dash.x_align = Clutter.ActorAlign.START;
dash.y_align = Clutter.ActorAlign.CENTER;
dash.add_style_class_name("vertical-overview");
if (global.vertical_overview.old_style_enabled && global.vertical_overview.default_old_style_enabled) {
dash.add_style_class_name("vertical-overview-old-dash");
}
let sizerBox = dash._background.get_children()[0];
sizerBox.clear_constraints();
sizerBox.add_constraint(new Clutter.BindConstraint({
source: dash._showAppsIcon.icon,
coordinate: Clutter.BindCoordinate.WIDTH,
}));
sizerBox.add_constraint(new Clutter.BindConstraint({
source: dash._dashContainer,
coordinate: Clutter.BindCoordinate.HEIGHT,
}));
dash._box.remove_all_children();
dash._separator = null;
dash._queueRedisplay();
}
function dash_max_height(settings, label) {
Main.overview._overview._controls.layoutManager.dashMaxHeightScale = settings.get_int(label) / 100.0;
}
function hide_dash(settings, label) {
if (settings.get_boolean(label)) {
Main.overview._overview._controls.dash.hide();
} else {
Main.overview._overview._controls.dash.show();
}
}
function show_apps_on_top(settings, label) {
let dash = Main.overview._overview._controls.dash;
if (settings.get_boolean(label)) {
dash._dashContainer.set_child_at_index(dash._showAppsIcon, 0);
} else {
dash._dashContainer.set_child_at_index(dash._showAppsIcon, 1);
}
}
function dash_max_icon_size(settings, label) {
let dash = Main.overview._overview._controls.dash;
dash.maxIconSizeOverride = settings.get_int(label);
dash._queueRedisplay();
}
function custom_run_indicator(settings, label) {
let dash = Main.overview._overview._controls.dash;
if (settings.get_boolean(label)) {
dash.customRunIndicatorEnabled = true;
} else {
dash.customRunIndicatorEnabled = false;
}
dash._box.remove_all_children();
dash._separator = null;
dash._queueRedisplay();
}
function dash_move_labels(settings, label) {
global.vertical_overview.dash_move_labels = settings.get_boolean(label);
}
function dash_old_style() {
let dash = Main.overview._overview._controls.dash;
if (global.vertical_overview.dash_override) {
if (global.vertical_overview.default_old_style_enabled) {
dash.add_style_class_name("vertical-overview");
} else {
dash.remove_style_class_name("vertical-overview");
}
if (global.vertical_overview.old_style_enabled) {
dash.add_style_class_name("vertical-overview-old-dash");
} else {
dash.remove_style_class_name("vertical-overview-old-dash");
}
}
}
function dash_disable_style() {
let dash = Main.overview._overview._controls.dash;
dash.remove_style_class_name("vertical-overview");
dash.remove_style_class_name("vertical-overview-old-dash");
}
function set_to_horizontal() {
let dash = Main.overview._overview._controls.dash;
dash._workId = global.vertical_overview.dash_workId; //pretty sure this is a leak, but there no provided way to disconnect these...
dash._box.layout_manager.orientation = Clutter.Orientation.HORIZONTAL;
dash._dashContainer.layout_manager.orientation = Clutter.Orientation.HORIZONTAL;
dash._dashContainer.y_expand = true;
dash._dashContainer.x_expand = false;
dash.x_align = Clutter.ActorAlign.CENTER;
dash.y_align = 0;
dash_disable_style();
let sizerBox = dash._background.get_children()[0];
sizerBox.clear_constraints();
sizerBox.add_constraint(new Clutter.BindConstraint({
source: dash._showAppsIcon.icon,
coordinate: Clutter.BindCoordinate.HEIGHT,
}));
sizerBox.add_constraint(new Clutter.BindConstraint({
source: dash._dashContainer,
coordinate: Clutter.BindCoordinate.WIDTH,
}));
dash._box.remove_all_children();
dash._separator = null;
dash._queueRedisplay();
}
var DashItemContainerOverride = {
showLabel() {
if (!this._labelText)
return;
this.label.set_text(this._labelText);
this.label.opacity = 0;
this.label.show();
let [stageX, stageY] = this.get_transformed_position();
let x, y;
if(global.vertical_overview.dash_move_labels) {
const itemHeight = this.allocation.get_height();
const labelHeight = this.label.get_height();
const yOffset = Math.floor((itemHeight - labelHeight) / 2);
let node = this.label.get_theme_node();
const xOffset = node.get_length('-x-offset');
x = stageX + this.width + xOffset;
y = Math.clamp(stageY + yOffset, 0, global.stage.height - labelHeight);
} else {
const itemWidth = this.allocation.get_width();
const labelWidth = this.label.get_width();
const xOffset = Math.floor((itemWidth - labelWidth) / 2);
let node = this.label.get_theme_node();
const yOffset = node.get_length('-y-offset');
x = Math.clamp(stageX + xOffset, 0, global.stage.width - labelWidth);
y = stageY - this.label.height - yOffset;
}
this.label.set_position(x, y);
this.label.ease({
opacity: 255,
duration: DASH_ITEM_LABEL_SHOW_TIME,
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
});
}
}
var DashOverride = {
handleDragOver: function (source, actor, _x, y, _time) {
let app = getAppFromSource(source);
// Don't allow favoriting of transient apps
if (app == null || app.is_window_backed())
return DND.DragMotionResult.NO_DROP;
if (!global.settings.is_writable('favorite-apps'))
return DND.DragMotionResult.NO_DROP;
let favorites = AppFavorites.getAppFavorites().getFavorites();
let numFavorites = favorites.length;
let favPos = favorites.indexOf(app);
let children = this._box.get_children();
let numChildren = children.length;
let boxHeight = this._box.height;
// Keep the placeholder out of the index calculation; assuming that
// the remove target has the same size as "normal" items, we don't
// need to do the same adjustment there.
if (this._dragPlaceholder) {
boxHeight -= this._dragPlaceholder.height;
numChildren--;
}
// Same with the separator
if (this._separator) {
boxHeight -= this._separator.height;
numChildren--;
}
let pos;
if (!this._emptyDropTarget)
pos = Math.floor(y * numChildren / boxHeight);
else
pos = 0; // always insert at the top when dash is empty
// Put the placeholder after the last favorite if we are not
// in the favorites zone
if (pos > numFavorites)
pos = numFavorites;
if (pos !== this._dragPlaceholderPos && this._animatingPlaceholdersCount === 0) {
this._dragPlaceholderPos = pos;
// Don't allow positioning before or after self
if (favPos != -1 && (pos == favPos || pos == favPos + 1)) {
this._clearDragPlaceholder();
return DND.DragMotionResult.CONTINUE;
}
// If the placeholder already exists, we just move
// it, but if we are adding it, expand its size in
// an animation
let fadeIn;
if (this._dragPlaceholder) {
this._dragPlaceholder.destroy();
fadeIn = false;
} else {
fadeIn = true;
}
this._dragPlaceholder = new DragPlaceholderItem();
this._dragPlaceholder.child.set_width(this.iconSize / 2);
this._dragPlaceholder.child.set_height(this.iconSize);
this._box.insert_child_at_index(this._dragPlaceholder,
this._dragPlaceholderPos);
this._dragPlaceholder.show(fadeIn);
}
if (!this._dragPlaceholder)
return DND.DragMotionResult.NO_DROP;
let srcIsFavorite = favPos != -1;
if (srcIsFavorite)
return DND.DragMotionResult.MOVE_DROP;
return DND.DragMotionResult.COPY_DROP;
},
_redisplay: function () {
let favorites = AppFavorites.getAppFavorites().getFavoriteMap();
let running = this._appSystem.get_running();
let children = this._box.get_children().filter(actor => {
return actor.child &&
actor.child._delegate &&
actor.child._delegate.app;
});
// Apps currently in the dash
let oldApps = children.map(actor => actor.child._delegate.app);
// Apps supposed to be in the dash
let newApps = [];
for (let id in favorites)
newApps.push(favorites[id]);
for (let i = 0; i < running.length; i++) {
let app = running[i];
if (app.get_id() in favorites)
continue;
newApps.push(app);
}
// Figure out the actual changes to the list of items; we iterate
// over both the list of items currently in the dash and the list
// of items expected there, and collect additions and removals.
// Moves are both an addition and a removal, where the order of
// the operations depends on whether we encounter the position
// where the item has been added first or the one from where it
// was removed.
// There is an assumption that only one item is moved at a given
// time; when moving several items at once, everything will still
// end up at the right position, but there might be additional
// additions/removals (e.g. it might remove all the launchers
// and add them back in the new order even if a smaller set of
// additions and removals is possible).
// If above assumptions turns out to be a problem, we might need
// to use a more sophisticated algorithm, e.g. Longest Common
// Subsequence as used by diff.
let addedItems = [];
let removedActors = [];
let newIndex = 0;
let oldIndex = 0;
while (newIndex < newApps.length || oldIndex < oldApps.length) {
let oldApp = oldApps.length > oldIndex ? oldApps[oldIndex] : null;
let newApp = newApps.length > newIndex ? newApps[newIndex] : null;
// No change at oldIndex/newIndex
if (oldApp == newApp) {
oldIndex++;
newIndex++;
continue;
}
// App removed at oldIndex
if (oldApp && !newApps.includes(oldApp)) {
removedActors.push(children[oldIndex]);
oldIndex++;
continue;
}
// App added at newIndex
if (newApp && !oldApps.includes(newApp)) {
addedItems.push({
app: newApp,
item: this._createAppItem(newApp),
pos: newIndex
});
newIndex++;
continue;
}
// App moved
let nextApp = newApps.length > newIndex + 1
? newApps[newIndex + 1] : null;
let insertHere = nextApp && nextApp == oldApp;
let alreadyRemoved = removedActors.reduce((result, actor) => {
let removedApp = actor.child._delegate.app;
return result || removedApp == newApp;
}, false);
if (insertHere || alreadyRemoved) {
let newItem = this._createAppItem(newApp);
addedItems.push({
app: newApp,
item: newItem,
pos: newIndex + removedActors.length
});
newIndex++;
} else {
removedActors.push(children[oldIndex]);
oldIndex++;
}
}
for (let i = 0; i < addedItems.length; i++) {
this._box.insert_child_at_index(addedItems[i].item,
addedItems[i].pos);
}
for (let i = 0; i < removedActors.length; i++) {
let item = removedActors[i];
// Don't animate item removal when the overview is transitioning
// or hidden
if (Main.overview.visible && !Main.overview.animationInProgress)
item.animateOutAndDestroy();
else
item.destroy();
}
this._adjustIconSize();
// Skip animations on first run when adding the initial set
// of items, to avoid all items zooming in at once
let animate = this._shownInitially && Main.overview.visible &&
!Main.overview.animationInProgress;
if (!this._shownInitially)
this._shownInitially = true;
for (let i = 0; i < addedItems.length; i++)
addedItems[i].item.show(animate);
// Update separator
const nFavorites = Object.keys(favorites).length;
const nIcons = children.length + addedItems.length - removedActors.length;
if (nFavorites > 0 && nFavorites < nIcons) {
// destroy the horizontal seperator if it exists.
// this is incredibly janky, but I can't think of a better way atm.
if (this._separator && this._separator.height !== 1) {
this._separator.destroy();
this._separator = null;
}
if (!this._separator) {
this._separator = new St.Widget({
style_class: 'dash-separator',
x_align: Clutter.ActorAlign.CENTER,
y_align: Clutter.ActorAlign.CENTER,
width: this.iconSize,
height: 1
});
this._box.add_child(this._separator)
}
//FIXME: separator placement is broken (also in original dash)
let pos = nFavorites;
if (this._dragPlaceholder)
pos++;
this._box.set_child_at_index(this._separator, pos);
} else if (this._separator) {
this._separator.destroy();
this._separator = null;
}
// Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=692744
// Without it, StBoxLayout may use a stale size cache
this._box.queue_relayout();
},
_adjustIconSize: function () {
// For the icon size, we only consider children which are "proper"
// icons (i.e. ignoring drag placeholders) and which are not
// animating out (which means they will be destroyed at the end of
// the animation)
let iconChildren = this._box.get_children().filter(actor => {
return actor.child &&
actor.child._delegate &&
actor.child._delegate.icon &&
!actor.animatingOut;
});
iconChildren.push(this._showAppsIcon);
if (this._maxWidth === -1 || this._maxHeight === -1)
return;
const themeNode = this.get_theme_node();
const maxAllocation = new Clutter.ActorBox({
x1: 0,
y1: 0,
x2: 42, /* not whatever */
y2: this._maxHeight,
});
let maxContent = themeNode.get_content_box(maxAllocation);
let spacing = themeNode.get_length('spacing');
let firstButton = iconChildren[0].child;
let firstIcon = firstButton._delegate.icon;
// Enforce valid spacings during the size request
firstIcon.icon.ensure_style();
const [, , iconWidth, iconHeight] = firstIcon.icon.get_preferred_size();
const [, , buttonWidth, buttonHeight] = firstButton.get_preferred_size();
let availWidth = this._maxWidth;
availWidth -= this._background.get_theme_node().get_horizontal_padding();
availWidth -= themeNode.get_horizontal_padding();
availWidth -= buttonWidth - iconWidth;
let availHeight = maxContent.y2 - maxContent.y1;
availHeight -= iconChildren.length * (buttonHeight - iconHeight) +
(iconChildren.length - 1) * spacing;
const maxIconSize = Math.min(availWidth, availHeight / iconChildren.length);
let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
let iconSizes = baseIconSizes.map(s => s * scaleFactor);
let newIconSize = baseIconSizes[0];
for (let i = 0; i < iconSizes.length; i++) {
if (iconSizes[i] <= maxIconSize)
newIconSize = baseIconSizes[i];
}
if (this.maxIconSizeOverride > 0 && this.maxIconSizeOverride < newIconSize) {
newIconSize = this.maxIconSizeOverride;
}
if (newIconSize == this.iconSize)
return;
let oldIconSize = this.iconSize;
this.iconSize = newIconSize;
this.emit('icon-size-changed');
let scale = oldIconSize / newIconSize;
for (let i = 0; i < iconChildren.length; i++) {
let icon = iconChildren[i].child._delegate.icon;
// Set the new size immediately, to keep the icons' sizes
// in sync with this.iconSize
icon.setIconSize(this.iconSize);
// Don't animate the icon size change when the overview
// is transitioning, not visible or when initially filling
// the dash
if (!Main.overview.visible || Main.overview.animationInProgress ||
!this._shownInitially)
continue;
let [targetWidth, targetHeight] = icon.icon.get_size();
// Scale the icon's texture to the previous size and
// tween to the new size
icon.icon.set_size(icon.icon.width * scale,
icon.icon.height * scale);
icon.icon.ease({
width: targetWidth,
height: targetHeight,
duration: DASH_ANIMATION_TIME,
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
});
}
if (this._separator) {
this._separator.ease({
width: this.iconSize,
duration: DASH_ANIMATION_TIME,
mode: Clutter.AnimationMode.EASE_OUT_QUAD,
});
}
},
_createAppItem: function (app) {
let appIcon = new DashIcon(app);
if (this.customRunIndicatorEnabled) {
let indicator = appIcon._dot;
indicator.x_align = Clutter.ActorAlign.START;
indicator.y_align = null;
}
appIcon.connectObject('menu-state-changed',
(o, opened) => {
this._itemMenuStateChanged(item, opened);
});
let item = new DashItemContainer();
item.setChild(appIcon);
// Override default AppIcon label_actor, now the
// accessible_name is set at DashItemContainer.setLabelText
appIcon.label_actor = null;
item.setLabelText(app.get_name());
appIcon.icon.setIconSize(this.iconSize);
this._hookUpLabel(item, appIcon);
return item;
}
}
|