Untitled

SUBMITTED BY: trior

DATE: March 17, 2018, 3:06 a.m.

FORMAT: Text only

SIZE: 2.7 kB

Raw Download

HITS: 965

Report
  1. --- appIcons.js 2018-02-27 14:14:00.000000000 +0000
  2. +++ appIcons_new.js 2018-03-15 04:38:25.528002000 +0000
  3. @@ -191,11 +191,61 @@
  5. this.forcedOverview = false;
  7. + this._dtpSettings.connect('changed::scroll-action', Lang.bind(this, function() {
  8. + this._optionalScrollCycleWindows();
  9. + }));
  10. + this._optionalScrollCycleWindows();
  11. +
  12. this._numberOverlay();
  14. this._signalsHandler = new Convenience.GlobalSignalsHandler();
  15. },
  17. + _optionalScrollCycleWindows: function() {
  18. +
  19. + if (this._scrollEventHandler) {
  20. + this.actor.disconnect(this._scrollEventHandler);
  21. + this._scrollEventHandler = 0;
  22. + }
  23. + this._scrollEventHandler = this.actor.connect('scroll-event', Lang.bind(this,
  24. + this.onScrollEvent));
  25. + },
  26. +
  27. + onScrollEvent: function(actor, event) {
  28. +
  29. + let focusedApp = tracker.focus_app;
  30. +
  31. + let direction = null;
  32. +
  33. + switch (event.get_scroll_direction()) {
  34. + case Clutter.ScrollDirection.UP:
  35. + direction = Meta.MotionDirection.UP;
  36. + break;
  37. + case Clutter.ScrollDirection.DOWN:
  38. + direction = Meta.MotionDirection.DOWN;
  39. + break;
  40. + case Clutter.ScrollDirection.SMOOTH:
  41. + let [dx, dy] = event.get_scroll_delta();
  42. + if (dy < 0)
  43. + direction = Meta.MotionDirection.UP;
  44. + else if (dy > 0)
  45. + direction = Meta.MotionDirection.DOWN;
  46. + break;
  47. + }
  48. +
  49. + if (!Main.overview._shown) {
  50. + let reversed = direction === Meta.MotionDirection.UP;
  51. + if (this.app == focusedApp)
  52. + cycleThroughWindows(this.app, this._dtpSettings, reversed, true);
  53. + else {
  54. + activateFirstWindow(this.app, this._dtpSettings);
  55. + }
  56. + }
  57. + else
  58. + this.app.activate();
  59. + return true;
  60. + },
  61. +
  62. _createWindowPreview: function() {
  63. // Abort if already activated
  64. if (this.menuManagerWindowPreview)
  65. @@ -1106,10 +1156,10 @@
  66. recentlyClickedAppIndex++;
  67. }
  68. let index = recentlyClickedAppIndex % recentlyClickedAppWindows.length;
  69. -
  70. - if(recentlyClickedAppWindows[index] === "MINIMIZE")
  71. + //The commented code give errors in windows viewing order but without it we get a non-blocking error.
  72. + /*if(recentlyClickedAppWindows[index] === "MINIMIZE")
  73. minimizeWindow(app, true, settings);
  74. - else
  75. + else*/
  76. Main.activateWindow(recentlyClickedAppWindows[index]);
  77. }
comments powered by Disqus