loleaflet/src/control/Control.PartsPreview.js | 2 +- loleaflet/src/layer/tile/TileLayer.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 430e310ea7a2d23e26bc90028b84c0546858cff1 Author: gokaysatir <[email protected]> AuthorDate: Fri Aug 28 21:36:35 2020 +0300 Commit: Andras Timar <[email protected]> CommitDate: Wed Sep 2 10:42:27 2020 +0200 loleaflet: Impress slide scroll improved. On tablet, slide preview scroll section is always on the left column. So when user switches to layout/portrait views, scroll item's classes should remain same. Change-Id: I84349cd48b317578d9bb2687c3a66aa788f57780 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101866 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/loleaflet/src/control/Control.PartsPreview.js b/loleaflet/src/control/Control.PartsPreview.js index 58408b48f..6d7b6c3da 100644 --- a/loleaflet/src/control/Control.PartsPreview.js +++ b/loleaflet/src/control/Control.PartsPreview.js @@ -179,7 +179,7 @@ L.Control.PartsPreview = L.Control.extend({ // re-create scrollbar with new direction var direction = this._direction; - this._direction = !window.mode.isDesktop() && L.DomUtil.isPortrait() ? 'x' : 'y'; + this._direction = !window.mode.isDesktop() && !window.mode.isTablet() && L.DomUtil.isPortrait() ? 'x' : 'y'; if (direction !== this._direction) { $(this._partsPreviewCont).mCustomScrollbar('destroy'); this.createScrollbar(); commit 3dd8f0075b8e3d0023b58e73d58b63169e673808 Author: Szymon Kłos <[email protected]> AuthorDate: Mon Jul 13 10:28:54 2020 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed Sep 2 10:42:12 2020 +0200 Don't show cell selection resize handles for desktop Change-Id: I6ac7518bd46308fffd692be576d368b5e5067fd6 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98619 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Szymon Kłos <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101524 Reviewed-by: Andras Timar <[email protected]> diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js index 5bb537f8d..cba7cf179 100644 --- a/loleaflet/src/layer/tile/TileLayer.js +++ b/loleaflet/src/layer/tile/TileLayer.js @@ -3075,11 +3075,11 @@ L.TileLayer = L.GridLayer.extend({ }, _onUpdateCellResizeMarkers: function () { - var singleCellOnDesktop = window.mode.isDesktop() - && !this._cellSelectionArea - && (this._cellCursor && !this._isEmptyRectangle(this._cellCursor)); + var selectionOnDesktop = window.mode.isDesktop() + && (this._cellSelectionArea + || (this._cellCursor && !this._isEmptyRectangle(this._cellCursor))); - if (!singleCellOnDesktop && + if (!selectionOnDesktop && (this._selections.getLayers().length !== 0 || (this._cellCursor && !this._isEmptyRectangle(this._cellCursor)))) { if (this._isEmptyRectangle(this._cellSelectionArea) && this._isEmptyRectangle(this._cellCursor)) { return; @@ -3115,7 +3115,7 @@ L.TileLayer = L.GridLayer.extend({ } } } - else if (singleCellOnDesktop) { + else if (selectionOnDesktop) { cellRectangle = this._cellSelectionArea ? this._cellSelectionArea : this._cellCursor; if (this._cellAutoFillArea) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
