loleaflet/dist/menubar.css | 1 - loleaflet/src/layer/tile/GridLayer.js | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-)
New commits: commit 0749db73a4656b1be9415520cf8a8fa3d20ee86c Author: Henry Castro <[email protected]> Date: Tue Sep 19 21:46:09 2017 -0400 loleaflet: fix background color of the top level menu items Change-Id: I548c700a16664e8acfc6010c1be549e6176f2383 (cherry picked from commit 0d870d444cbbcd1141319f60834bacb80e8d233f) Reviewed-on: https://gerrit.libreoffice.org/49011 Reviewed-by: Samuel Mehrbrodt <[email protected]> Tested-by: Samuel Mehrbrodt <[email protected]> diff --git a/loleaflet/dist/menubar.css b/loleaflet/dist/menubar.css index 8fd903c4..1d8e5eec 100644 --- a/loleaflet/dist/menubar.css +++ b/loleaflet/dist/menubar.css @@ -40,7 +40,6 @@ } .lo-menu a.disabled { - background: #efefef; cursor: default; } .lo-menu > li > a.has-submenu { commit 07d024d3a305ca88087b18e977c8d925064ce8a2 Author: Marco Cecchetti <[email protected]> Date: Mon Dec 11 11:35:49 2017 +0100 missing to update a tile content When a tile has been invalidated, and the new tile content has not yet been fetched and in the between a `canceltiles` message occurs, the new tile content will never be fetched; example: a tile is invalidated but a sudden scroll to the cell cursor position causes to move the tile out of the visible area before the new content is fetched, so when the tile is back inside the visible area its content would be the old invalidated one; Change-Id: Ib5f2605490cb9b15fba146e185f683cb7b8d31b6 Reviewed-on: https://gerrit.libreoffice.org/46534 Reviewed-by: Marco Cecchetti <[email protected]> Tested-by: Marco Cecchetti <[email protected]> (cherry picked from commit 037a2b246c4c440568f3d5b90521c8c7d2cd3034) Reviewed-on: https://gerrit.libreoffice.org/49017 Reviewed-by: Samuel Mehrbrodt <[email protected]> Tested-by: Samuel Mehrbrodt <[email protected]> diff --git a/loleaflet/src/layer/tile/GridLayer.js b/loleaflet/src/layer/tile/GridLayer.js index f61d50c4..54fe1d92 100644 --- a/loleaflet/src/layer/tile/GridLayer.js +++ b/loleaflet/src/layer/tile/GridLayer.js @@ -538,7 +538,13 @@ L.GridLayer = L.Layer.extend({ // so we're able to cancel the previous requests that are being processed this._map._socket.sendMessage('canceltiles'); for (key in this._tiles) { - if (!this._tiles[key].loaded) { + // When _invalidCount > 0 the tile has been invalidated, however the new tile content + // has not yet been fetched and because of `canceltiles` message it will never be + // so we need to remove the tile, or when the tile is back inside the visible area + // its content would be the old invalidated one; + // example: a tile is invalidated but a sudden scroll to the cell cursor position causes + // to move the tile out of the visible area before the new content is fetched + if (!this._tiles[key].loaded || this._tiles[key]._invalidCount > 0) { L.DomUtil.remove(this._tiles[key].el); delete this._tiles[key]; if (this._debug) { @@ -611,7 +617,13 @@ L.GridLayer = L.Layer.extend({ this._map._socket.sendMessage('canceltiles'); for (key in this._tiles) { tile = this._tiles[key]; - if (!tile.loaded) { + // When _invalidCount > 0 the tile has been invalidated, however the new tile content + // has not yet been fetched and because of `canceltiles` message it will never be + // so we need to remove the tile, or when the tile is back inside the visible area + // its content would be the old invalidated one; + // example: a tile is invalidated but a sudden scroll to the cell cursor position causes + // to move the tile out of the visible area before the new content is fetched + if (!tile.loaded || tile._invalidCount > 0) { L.DomUtil.remove(tile.el); delete this._tiles[key]; if (this._debug && this._debugDataCancelledTiles) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
