From 32fe0017ee87d21eb4bf16efa42ab0328bb159e4 Mon Sep 17 00:00:00 2001
From: Tomaž Vajngerl <tomaz.vajngerl@collabora.com>
Date: Wed, 1 Oct 2014 17:46:03 +0200
Subject: android: fix redrawing everyting on part change (via sidebar)

Change-Id: If7aeeca3da65f44dfe1f9a5bc347baf4e3cadd82
---
 .../LOAndroid3/src/java/org/libreoffice/LOKitThread.java             | 5 +++--
 .../LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java  | 2 +-
 .../LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java  | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'android')

diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 54478bfc1e82..31b9eb51a886 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -46,10 +46,11 @@ public class LOKitThread extends Thread {
             mApplication.getLayerController().getView().changeCheckerboardBitmap(bitmap, mTileProvider.getPageWidth(), mTileProvider.getPageHeight());
         }
 
-        mLayerClient.clearAllTiles();
-
+        mLayerClient.clearAndResetlayers();
+        draw();
         RectF rect = new RectF(0, 0, mTileProvider.getPageWidth(), mTileProvider.getPageHeight());
         mController.setPageRect(rect, rect);
+        mController.setViewportMetrics(mController.getViewportMetrics());
         mController.setForceRedraw();
     }
 
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
index c6c7d79383b0..1ad8d38313b3 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
@@ -195,7 +195,7 @@ public class DynamicTileLayer extends Layer {
         }
     }
 
-    public void clearAllTiles() {
+    public void clearAndReset() {
         tiles.clear();
         currentViewport = new RectF();
     }
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
index 5905d4a006ca..23095ef13f78 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
@@ -264,8 +264,8 @@ public class GeckoLayerClient implements LayerView.Listener {
         mRootLayer.reevaluateTiles(mLayerController.getViewportMetrics());
     }
 
-    public void clearAllTiles() {
-        mRootLayer.clearAllTiles();
+    public void clearAndResetlayers() {
+        mRootLayer.clearAndReset();
     }
 
     private class AdjustRunnable implements Runnable {
-- 
cgit