[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 290 commits - android/Bootstrap android/experimental android/mobile-config.py autogen.sh avmedia/inc avmedia/source basctl/source basegfx/source basic/source bin/run canvas/Library_cairocanvas.mk canvas/Library_oglcanvas.mk canvas/source chart2/qa chart2/source compilerplugins/clang configure.ac connectivity/CppunitTest_connectivity_ado.mk connectivity/CppunitTest_connectivity_commontools.mk connectivity/Library_ado.mk connectivity/source cppcanvas/source cui/source cui/uiconfig dbaccess/source desktop/Library_deploymentgui.mk desktop/Library_sofficeapp.mk desktop/source desktop/test desktop/uiconfig drawinglayer/source editeng/source embeddedobj/Library_emboleobj.mk embedserv/Library_emser.mk extensions/Library_oleautobridge.mk extensions/source external/boost external/graphite external/hunspell external/jpeg-turbo external/liborcus external/poppler filter/source forms/source formula/source fpicker/source framework/inc framework/so urce helpcontent2 hwpfilter/source icon-themes/galaxy icon-themes/industrial icon-themes/tango include/basegfx include/comphelper include/connectivity include/formula include/LibreOfficeKit include/o3tl include/oox include/registry include/sfx2 include/svtools include/svx include/toolkit include/tools include/vbahelper include/vcl jvmfwk/plugins libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk libreofficekit/Module_libreofficekit.mk libreofficekit/qa libreofficekit/source lingucomponent/source linguistic/source lotuswordpro/source Makefile.in odk/examples odk/source offapi/com officecfg/registry oox/source opencl/inc pyuno/source qadevOOo/tests reportdesign/inc reportdesign/source RepositoryExternal.mk rsc/inc rsc/source sal/Library_sal.mk sal/osl sal/qa sal/rtl sax/qa sax/source scaddins/source sc/inc scp2/source sc/qa scripting/examples scripting/source sc/source sd/CppunitTest_sd_import_tests.mk sdext/source sd/inc sd/qa sd/source sd/uiconfig setup_native/Library_sella ngmsi.mk setup_native/Library_shlxtmsi.mk setup_native/source sfx2/source shell/inc shell/Library_ooofilt.mk shell/Library_ooofilt_x64.mk shell/Library_propertyhdl.mk shell/Library_propertyhdl_x64.mk shell/Library_shlxthdl.mk shell/Library_shlxthdl_x64.mk shell/source shell/StaticLibrary_shlxthandler_common.mk shell/StaticLibrary_shlxthandler_common_x64.mk slideshow/Library_OGLTrans.mk slideshow/source solenv/bin solenv/gbuild soltools/mkdepend starmath/inc starmath/source svgio/inc svl/source svtools/qa svtools/source svx/Executable_gengal.mk svx/inc svx/source sw/Executable_tiledrendering.mk sw/inc sw/ooxmlexport_setup.mk sw/qa sw/source sw/uiconfig test/source testtools/source toolkit/source tools/source ucb/source udkapi/com UnoControls/source unoidl/source unusedcode.easy vbahelper/source vcl/Executable_icontest.mk vcl/Executable_mtfdemo.mk vcl/Executable_ui-previewer.mk vcl/Executable_vcldemo.mk vcl/generic vcl/headless vcl/inc vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl /Library_vclplug_gtk3.mk vcl/Library_vclplug_svp.mk vcl/Module_vcl.mk vcl/opengl vcl/osx vcl/qa vcl/quartz vcl/README vcl/source vcl/StaticLibrary_glxtest.mk vcl/StaticLibrary_headless.mk vcl/unx vcl/win vcl/WinResTarget_vcl.mk vcl/workben writerfilter/source xmloff/source xmlsecurity/source
Miklos Vajna
vmiklos at collabora.co.uk
Mon Mar 9 02:20:07 PDT 2015
Rebased ref, commits from common ancestor:
commit 8c7a68ef4201dac712ef489762a119b745f64988
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Mar 9 09:07:06 2015 +0100
Fix Linux baseline build
1) One more place in desktop that missed the LOK_TEST check.
2) One testcase currently fails on baseline, disabled for now, need to
check later.
Change-Id: I8c8bcf2cec1618e39e8453120755dffd3feb79ce
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 2878329..60a0658 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -558,7 +558,8 @@ void syncRepositories(
}
}
#if !HAVE_FEATURE_MACOSX_SANDBOX
- if (bModified)
+ // getenv is a hack to detect if we're running in a LOK unit test
+ if (bModified && !getenv("LOK_TEST"))
{
Reference<task::XRestartManager> restarter(task::OfficeRestartManager::get(comphelper::getProcessComponentContext()));
if (restarter.is())
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx b/libreofficekit/qa/unit/tiledrendering.cxx
index 44f1bed..a12d976 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -63,8 +63,8 @@ public:
void testDocumentLoadFail( Office* pOffice );
void testDocumentTypes( Office* pOffice );
- void testImpressSlideNames( Office* pOffice );
#if 0
+ void testImpressSlideNames( Office* pOffice );
void testOverlay( Office* pOffice );
#endif
@@ -91,8 +91,8 @@ void TiledRenderingTest::runAllTests()
testDocumentLoadFail( pOffice.get() );
testDocumentTypes( pOffice.get() );
- testImpressSlideNames( pOffice.get() );
#if 0
+ testImpressSlideNames( pOffice.get() );
testOverlay( pOffice.get() );
#endif
}
@@ -139,6 +139,7 @@ void TiledRenderingTest::testDocumentTypes( Office* pOffice )
// TODO: do this for all supported document types
}
+#if 0
void TiledRenderingTest::testImpressSlideNames( Office* pOffice )
{
const string sDocPath = m_sSrcRoot + "/libreofficekit/qa/data/impress_slidenames.odp";
@@ -160,7 +161,6 @@ void TiledRenderingTest::testImpressSlideNames( Office* pOffice )
// have a localised version of "Slide 3".
}
-#if 0
static void dumpRGBABitmap( const OUString& rPath, const unsigned char* pBuffer,
const int nWidth, const int nHeight )
{
commit 8f73bb4d8e12cc1458a2c4e7054f1af508d48e97
Author: Jan Holesovsky <kendy at collabora.com>
Date: Mon Mar 9 09:04:46 2015 +0100
Whitespace in a recent commit.
Change-Id: Ied315d27cd0b5dbe640a2a3c87f5dc6c3dc11bf0
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx
index a2bb960..01fab7a 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -472,7 +472,8 @@ void LoadURL( SwViewShell& rVSh, const OUString& rURL, sal_uInt16 nFilter,
return;
// We are doing tiledRendering, let the client handles the URL loading.
- if (rVSh.isTiledRendering()) {
+ if (rVSh.isTiledRendering())
+ {
rVSh.libreOfficeKitCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
OUStringToOString(rURL, RTL_TEXTENCODING_UTF8).getStr());
return;
@@ -481,7 +482,6 @@ void LoadURL( SwViewShell& rVSh, const OUString& rURL, sal_uInt16 nFilter,
//A CrsrShell is always a WrtShell
SwWrtShell &rSh = static_cast<SwWrtShell&>(rVSh);
-
SwDocShell* pDShell = rSh.GetView().GetDocShell();
OSL_ENSURE( pDShell, "No DocShell?!");
OUString sTargetFrame(rTargetFrameName);
commit 8c5a9009c8126bae0da9c8f6e68056dee291ea26
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Mon Mar 9 16:03:13 2015 +0900
android: don't hide CursorView by default
Change-Id: Ic662d71face370457c122946c8dbcb56d6f2bfe7
diff --git a/android/experimental/LOAndroid3/res/layout/text_selection_handles.xml b/android/experimental/LOAndroid3/res/layout/text_selection_handles.xml
index 3de21f6..122d1b8 100644
--- a/android/experimental/LOAndroid3/res/layout/text_selection_handles.xml
+++ b/android/experimental/LOAndroid3/res/layout/text_selection_handles.xml
@@ -29,7 +29,6 @@
<org.libreoffice.TextCursorView android:id="@+id/text_cursor_view"
android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:visibility="gone"/>
+ android:layout_height="fill_parent"/>
</merge>
commit 049aa53dc2d37efade89b8a96ef60ea7bd428192
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Fri Mar 6 22:13:44 2015 +0900
android: add CALLBACK_GRAPHIC_SELECTION to LOK facade
Change-Id: I105f8811f810b393cac8518b42d77f8bd4d0c763
diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index 56d92b0..07d4329 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -40,7 +40,7 @@ public class Document {
public static final int CALLBACK_TEXT_SELECTION_START = 3;
public static final int CALLBACK_TEXT_SELECTION_END = 4;
public static final int CALLBACK_CURSOR_VISIBLE = 5;
- // LOK_CALLBACK_GRAPHIC_SELECTION = 6
+ public static final int CALLBACK_GRAPHIC_SELECTION = 6;
public static final int CALLBACK_HYPERLINK_CLICKED = 7;
/**
commit a54fe6d7be57b130d0261964d8e912b34345f751
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Fri Mar 6 22:13:14 2015 +0900
android: fix rebase import problem
Change-Id: Id668dc509dc3fa02e9a248716050c16a8cf91419
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
index f50b62a..9419782 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
@@ -1,6 +1,8 @@
package org.libreoffice;
+import android.content.Intent;
import android.graphics.RectF;
+import android.net.Uri;
import android.util.Log;
import org.libreoffice.kit.Document;
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index ae14cc6..3a24120 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -5,8 +5,6 @@ import android.graphics.PointF;
import android.graphics.RectF;
import android.util.Log;
import android.view.KeyEvent;
-import android.net.Uri;
-import android.content.Intent;
import org.libreoffice.kit.DirectBufferAllocator;
import org.libreoffice.kit.Document;
commit 1a8b898842f2d4a0c5576e68bfa45b9737ab5fbf
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Fri Mar 6 21:56:49 2015 +0900
android: do all overlay state tracking in InvalidationHandler
Do all overlay changes and state tracking in InvalidationHandler
where we get invalidation and selection / cursor messages from
LibreOfficeKit.
Change-Id: I87ccdefedc01e8bd54666b694a9a429a1fc6af76
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
index 478ab2d..f50b62a 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
@@ -18,8 +18,9 @@ public class InvalidationHandler implements Document.MessageCallback {
private static String LOGTAG = InvalidationHandler.class.getSimpleName();
private TileProvider mTileProvider;
- private TextCursorLayer mTextCursorLayer;
- private TextSelection mTextSelection;
+ private final TextCursorLayer mTextCursorLayer;
+ private final TextSelection mTextSelection;
+
private OverlayState mState;
public InvalidationHandler(LibreOfficeMainActivity mainActivity) {
@@ -52,13 +53,13 @@ public class InvalidationHandler implements Document.MessageCallback {
invalidateCursor(payload);
break;
case Document.CALLBACK_TEXT_SELECTION:
- invalidateSelection(payload);
+ textSelection(payload);
break;
case Document.CALLBACK_TEXT_SELECTION_START:
- invalidateSelectionStart(payload);
+ textSelectionStart(payload);
break;
case Document.CALLBACK_TEXT_SELECTION_END:
- invalidateSelectionEnd(payload);
+ textSelectionEnd(payload);
break;
case Document.CALLBACK_CURSOR_VISIBLE:
cursorVisibility(payload);
@@ -75,14 +76,6 @@ public class InvalidationHandler implements Document.MessageCallback {
}
}
- public OverlayState getOverlayState() {
- return mState;
- }
-
- public void setOverlayState(OverlayState state) {
- this.mState = state;
- }
-
/**
* Parses the payload text with rectangle coordinates and converts to rectangle in pixel coordinates
*
@@ -90,7 +83,7 @@ public class InvalidationHandler implements Document.MessageCallback {
* @return rectangle in pixel coordinates
*/
private RectF convertPayloadToRectangle(String payload) {
- String payloadWithoutWhitespace = payload.replaceAll("\\s",""); // remove all whitespace from the string
+ String payloadWithoutWhitespace = payload.replaceAll("\\s", ""); // remove all whitespace from the string
if (payloadWithoutWhitespace.isEmpty() || payloadWithoutWhitespace.equals("EMPTY")) {
return null;
@@ -157,72 +150,57 @@ public class InvalidationHandler implements Document.MessageCallback {
*
* @param payload
*/
- private void invalidateCursor(String payload) {
+ private synchronized void invalidateCursor(String payload) {
RectF cursorRectangle = convertPayloadToRectangle(payload);
if (cursorRectangle != null) {
- if (mState == OverlayState.CURSOR) {
- mTextSelection.positionHandle(TextSelectionHandle.HandleType.MIDDLE, cursorRectangle);
- mTextSelection.showHandle(TextSelectionHandle.HandleType.MIDDLE);
- mTextSelection.hideHandle(TextSelectionHandle.HandleType.START);
- mTextSelection.hideHandle(TextSelectionHandle.HandleType.END);
- }
+ mTextSelection.positionHandle(TextSelectionHandle.HandleType.MIDDLE, cursorRectangle);
mTextCursorLayer.positionCursor(cursorRectangle);
- mTextCursorLayer.showCursor();
+
+ if (mState == OverlayState.TRANSITION_TO_CURSOR) {
+ changeStateTo(OverlayState.CURSOR);
+ };
}
}
/**
- * Handles the selection start invalidation message
+ * Handles the text selection start message
*
* @param payload
*/
- private void invalidateSelectionStart(String payload) {
- if (mState == OverlayState.NONE) {
- return;
- }
- RectF selectionRectangle = convertPayloadToRectangle(payload);
- if (selectionRectangle != null) {
- mTextSelection.positionHandle(TextSelectionHandle.HandleType.START, selectionRectangle);
- mTextSelection.showHandle(TextSelectionHandle.HandleType.START);
- mTextSelection.hideHandle(TextSelectionHandle.HandleType.MIDDLE);
- mState = OverlayState.SELECTION;
+ private synchronized void textSelectionStart(String payload) {
+ RectF selectionRect = convertPayloadToRectangle(payload);
+ if (selectionRect != null) {
+ mTextSelection.positionHandle(TextSelectionHandle.HandleType.START, selectionRect);
}
}
/**
- * Handles the selection end invalidation message
+ * Handles the text selection end message
*
* @param payload
*/
- private void invalidateSelectionEnd(String payload) {
- if (mState == OverlayState.NONE) {
- return;
- }
+ private synchronized void textSelectionEnd(String payload) {
RectF selectionRect = convertPayloadToRectangle(payload);
if (selectionRect != null) {
mTextSelection.positionHandle(TextSelectionHandle.HandleType.END, selectionRect);
- mTextSelection.showHandle(TextSelectionHandle.HandleType.END);
- mTextSelection.hideHandle(TextSelectionHandle.HandleType.MIDDLE);
- mState = OverlayState.SELECTION;
}
}
/**
- * Handles the selection invalidation message
+ * Handles the text selection message
*
* @param payload
*/
- private void invalidateSelection(String payload) {
- if (mState == OverlayState.NONE) {
- return;
- }
- if (payload.isEmpty()) {
- mState = OverlayState.CURSOR;
- mTextSelection.hideHandle(TextSelectionHandle.HandleType.START);
- mTextSelection.hideHandle(TextSelectionHandle.HandleType.END);
+ private synchronized void textSelection(String payload) {
+ if (payload.isEmpty() || payload.equals("EMPTY")) {
+ if (mState == OverlayState.SELECTION) {
+ changeStateTo(OverlayState.TRANSITION_TO_CURSOR);
+ }
mTextCursorLayer.changeSelections(Collections.EMPTY_LIST);
} else {
- mState = OverlayState.SELECTION;
+ if (mState == OverlayState.TRANSITION_TO_SELECTION) {
+ changeStateTo(OverlayState.SELECTION);
+ }
List<RectF> rects = convertPayloadToRectangles(payload);
mTextCursorLayer.changeSelections(rects);
}
@@ -230,22 +208,110 @@ public class InvalidationHandler implements Document.MessageCallback {
/**
* Handles the cursor visibility message
+ *
* @param payload
*/
- private void cursorVisibility(String payload) {
+ private synchronized void cursorVisibility(String payload) {
if (payload.equals("true")) {
- mTextSelection.showHandle(TextSelectionHandle.HandleType.MIDDLE);
mTextCursorLayer.showCursor();
} else if (payload.equals("false")) {
- mTextSelection.hideHandle(TextSelectionHandle.HandleType.MIDDLE);
mTextCursorLayer.hideCursor();
- LibreOfficeMainActivity.mAppContext.hideSoftKeyboard();
}
}
+ public synchronized void changeStateTo(OverlayState next) {
+ changeState(mState, next);
+ }
+
+ private synchronized void changeState(OverlayState previous, OverlayState next) {
+ if (isInvalidTransition(previous, next)) {
+ return;
+ }
+
+ Log.i(LOGTAG, "State change: " + previous.name() + " -> " + next.name());
+
+ mState = next;
+
+ switch (next) {
+ case CURSOR:
+ handleCursorState(previous);
+ break;
+ case TRANSITION_TO_CURSOR:
+ handleTransitionToCursorState(previous);
+ break;
+ case SELECTION:
+ handleSelectionState(previous);
+ break;
+ case TRANSITION_TO_SELECTION:
+ handleTransitionToSelectionState(previous);
+ break;
+ case NONE:
+ handleNoneState(previous);
+ break;
+ }
+ }
+
+ private void handleNoneState(OverlayState previous) {
+ if (previous == OverlayState.NONE) {
+ return;
+ }
+ // Just hide everything
+ if (mTileProvider != null) {
+ mTileProvider.setTextSelectionReset();
+ }
+ mTextSelection.hideHandle(TextSelectionHandle.HandleType.START);
+ mTextSelection.hideHandle(TextSelectionHandle.HandleType.END);
+ mTextSelection.hideHandle(TextSelectionHandle.HandleType.MIDDLE);
+ mTextCursorLayer.hideSelections();
+ mTextCursorLayer.hideCursor();
+ LibreOfficeMainActivity.mAppContext.hideSoftKeyboard();
+ }
+
+ private void handleTransitionToSelectionState(OverlayState previous) {
+ if (previous == OverlayState.CURSOR) {
+ mTextSelection.hideHandle(TextSelectionHandle.HandleType.MIDDLE);
+ }
+ }
+
+ private void handleSelectionState(OverlayState previous) {
+ if (previous == OverlayState.TRANSITION_TO_SELECTION) {
+ mTextSelection.showHandle(TextSelectionHandle.HandleType.START);
+ mTextSelection.showHandle(TextSelectionHandle.HandleType.END);
+ mTextCursorLayer.showSelections();
+ }
+ }
+
+ private void handleCursorState(OverlayState previous) {
+ if (previous == OverlayState.CURSOR) {
+ LibreOfficeMainActivity.mAppContext.showSoftKeyboard();
+ } else if (previous == OverlayState.TRANSITION_TO_CURSOR) {
+ LibreOfficeMainActivity.mAppContext.showSoftKeyboard();
+ mTextSelection.showHandle(TextSelectionHandle.HandleType.MIDDLE);
+ mTextCursorLayer.showCursor();
+ }
+ }
+
+ private void handleTransitionToCursorState(OverlayState previous) {
+ if (previous == OverlayState.SELECTION) {
+ if (mTileProvider != null) {
+ mTileProvider.setTextSelectionReset();
+ }
+ mTextSelection.hideHandle(TextSelectionHandle.HandleType.START);
+ mTextSelection.hideHandle(TextSelectionHandle.HandleType.END);
+ mTextCursorLayer.hideSelections();
+ }
+ }
+
+ private boolean isInvalidTransition(OverlayState previous, OverlayState next) {
+ return (previous == OverlayState.CURSOR && next == OverlayState.TRANSITION_TO_CURSOR)
+ || (previous == OverlayState.SELECTION && next == OverlayState.TRANSITION_TO_SELECTION);
+ }
+
public enum OverlayState {
NONE,
CURSOR,
- SELECTION
+ TRANSITION_TO_CURSOR,
+ SELECTION,
+ TRANSITION_TO_SELECTION
}
}
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index e3c7c2c..252f64e 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -220,8 +220,6 @@ public class LOKitThread extends Thread {
private void changeHandlePosition(TextSelectionHandle.HandleType handleType, PointF documentCoordinate) {
if (handleType == TextSelectionHandle.HandleType.MIDDLE) {
- LibreOfficeMainActivity.mAppContext.showSoftKeyboard();
- mInvalidationHandler.setOverlayState(InvalidationHandler.OverlayState.CURSOR);
mTileProvider.mouseButtonDown(documentCoordinate, 1);
mTileProvider.mouseButtonUp(documentCoordinate, 1);
} else if (handleType == TextSelectionHandle.HandleType.START) {
@@ -263,19 +261,15 @@ public class LOKitThread extends Thread {
return;
}
if (touchType.equals("LongPress")) {
- mInvalidationHandler.setOverlayState(InvalidationHandler.OverlayState.SELECTION);
+ mInvalidationHandler.changeStateTo(InvalidationHandler.OverlayState.TRANSITION_TO_SELECTION);
mTileProvider.mouseButtonDown(documentCoordinate, 1);
mTileProvider.mouseButtonUp(documentCoordinate, 1);
mTileProvider.mouseButtonDown(documentCoordinate, 2);
mTileProvider.mouseButtonUp(documentCoordinate, 2);
} else { // "SingleTap"
- LibreOfficeMainActivity.mAppContext.showSoftKeyboard();
- mInvalidationHandler.setOverlayState(InvalidationHandler.OverlayState.CURSOR);
+ mInvalidationHandler.changeStateTo(InvalidationHandler.OverlayState.TRANSITION_TO_CURSOR);
mTileProvider.mouseButtonDown(documentCoordinate, 1);
mTileProvider.mouseButtonUp(documentCoordinate, 1);
- if (mInvalidationHandler.getOverlayState() == InvalidationHandler.OverlayState.SELECTION) {
- mTileProvider.setTextSelectionReset();
- }
}
}
commit b792f60279186953889591c5dd4bc76017db7aa0
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Fri Mar 6 21:52:42 2015 +0900
android: handle callbacks directly in InvalidationHandler
Change-Id: Ic4ceaadcf251f7257001f8043161ce15898d7239
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
index 7bc5824..478ab2d 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
@@ -14,9 +14,10 @@ import java.util.List;
/**
* Parses (interprets) and handles invalidation messages from LibreOffice.
*/
-public class InvalidationHandler {
+public class InvalidationHandler implements Document.MessageCallback {
private static String LOGTAG = InvalidationHandler.class.getSimpleName();
+ private TileProvider mTileProvider;
private TextCursorLayer mTextCursorLayer;
private TextSelection mTextSelection;
private OverlayState mState;
@@ -24,16 +25,25 @@ public class InvalidationHandler {
public InvalidationHandler(LibreOfficeMainActivity mainActivity) {
mTextCursorLayer = mainActivity.getTextCursorLayer();
mTextSelection = mainActivity.getTextSelection();
+ mTileProvider = null;
mState = OverlayState.NONE;
}
+ public void setTileProvider(TileProvider tileProvider) {
+ mTileProvider = tileProvider;
+ }
+
/**
- * Processes invalidation message
+ * Processes callback message
*
* @param messageID - ID of the message
* @param payload - additional invalidation message payload
*/
- public void processMessage(int messageID, String payload) {
+ @Override
+ public void messageRetrieved(int messageID, String payload) {
+ if (!LOKitShell.isEditingEnabled()) {
+ return;
+ }
switch (messageID) {
case Document.CALLBACK_INVALIDATE_TILES:
invalidateTiles(payload);
@@ -53,6 +63,15 @@ public class InvalidationHandler {
case Document.CALLBACK_CURSOR_VISIBLE:
cursorVisibility(payload);
break;
+ case Document.CALLBACK_HYPERLINK_CLICKED:
+ if (!payload.startsWith("http://") && !payload.startsWith("https://")) {
+ payload = "http://" + payload;
+ }
+
+ Intent urlIntent = new Intent(Intent.ACTION_VIEW);
+ urlIntent.setData(Uri.parse(payload));
+ LibreOfficeMainActivity.mAppContext.startActivity(urlIntent);
+ break;
}
}
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 78e18d3..e3c7c2c 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -159,6 +159,7 @@ public class LOKitThread extends Thread {
mInvalidationHandler = new InvalidationHandler(LibreOfficeMainActivity.mAppContext);
mTileProvider = TileProviderFactory.create(mLayerClient, mInvalidationHandler, filename);
+ mInvalidationHandler.setTileProvider(mTileProvider);
if (mTileProvider.isReady()) {
LOKitShell.showProgressSpinner();
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index 179c6ff..ae14cc6 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -28,7 +28,7 @@ import java.nio.ByteBuffer;
/**
* LOKit implementation of TileProvider.
*/
-public class LOKitTileProvider implements TileProvider, Document.MessageCallback {
+public class LOKitTileProvider implements TileProvider {
private static final String LOGTAG = LOKitTileProvider.class.getSimpleName();
private static int TILE_SIZE = 256;
private final GeckoLayerClient mLayerClient;
@@ -43,13 +43,13 @@ public class LOKitTileProvider implements TileProvider, Document.MessageCallback
private float mWidthTwip;
private float mHeightTwip;
- private InvalidationHandler mInvalidationHandler;
+ private Document.MessageCallback mMessageCallback;
private long objectCreationTime = System.currentTimeMillis();
- public LOKitTileProvider(GeckoLayerClient layerClient, InvalidationHandler invalidationHandler, String input) {
+ public LOKitTileProvider(GeckoLayerClient layerClient, Document.MessageCallback messageCallback, String input) {
mLayerClient = layerClient;
- mInvalidationHandler = invalidationHandler;
+ mMessageCallback = messageCallback;
mDPI = (float) LOKitShell.getDpi();
mTileWidth = pixelToTwip(TILE_SIZE, mDPI);
mTileHeight = pixelToTwip(TILE_SIZE, mDPI);
@@ -89,7 +89,7 @@ public class LOKitTileProvider implements TileProvider, Document.MessageCallback
}
public void postLoad() {
- mDocument.setMessageCallback(this);
+ mDocument.setMessageCallback(mMessageCallback);
int parts = mDocument.getParts();
Log.i(LOGTAG, "Document parts: " + parts);
@@ -407,32 +407,6 @@ public class LOKitTileProvider implements TileProvider, Document.MessageCallback
return mDocument.getPart();
}
-
- /**
- * Process the retrieved messages from LOK
- */
- @Override
- public void messageRetrieved(int messageID, String payload) {
- /**
- * Handles messages that do not require entering editing mode.
- */
- switch (messageID) {
- case Document.CALLBACK_HYPERLINK_CLICKED:
- if (!payload.startsWith("http://") &&
- !payload.startsWith("https://"))
- payload = "http://" + payload;
-
- Intent url_intent = new Intent(Intent.ACTION_VIEW);
- url_intent.setData(Uri.parse(payload));
- LibreOfficeMainActivity.mAppContext.startActivity(url_intent);
- return;
- }
-
- if (!LOKitShell.isEditingEnabled()) {
- return;
- }
- mInvalidationHandler.processMessage(messageID, payload);
- }
}
// vim:set shiftwidth=4 softtabstop=4 expandtab:
commit d5c32b45186dfa8e78116841f5bb0a73ee545b33
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Fri Mar 6 18:56:13 2015 +0900
android: minor code clean-up in TextSelectionHandle
Change-Id: I5ad3c0f853efe1cf314f3c1afd77cecfdfc59134
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/TextSelectionHandle.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/TextSelectionHandle.java
index 36472a5..1a7ac97 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/TextSelectionHandle.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/TextSelectionHandle.java
@@ -52,8 +52,8 @@ public class TextSelectionHandle extends ImageView implements View.OnTouchListen
super(context, attrs);
setOnTouchListener(this);
- TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.TextSelectionHandle);
- int handleType = a.getInt(R.styleable.TextSelectionHandle_handleType, 0x01);
+ TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.TextSelectionHandle);
+ int handleType = array.getInt(R.styleable.TextSelectionHandle_handleType, 0x01);
switch (handleType) {
case 1:
commit 58c89e41408e1ea0a93d84a02e0921bfe1b34c5c
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Fri Mar 6 18:54:27 2015 +0900
android: support to make selections visible/invisible
Change-Id: Iaebf3e5a2f0c11efa7110b7062ecfc3ae38e0e64
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorLayer.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorLayer.java
index 0fa3764..ce17c68 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorLayer.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorLayer.java
@@ -80,6 +80,26 @@ public class TextCursorLayer extends Layer {
});
}
+ public void showSelections() {
+ LOKitShell.getMainHandler().post(new Runnable() {
+ public void run() {
+ LayerView layerView = LOKitShell.getLayerView();
+ if (layerView != null) {
+ layerView.addLayer(TextCursorLayer.this);
+ }
+ mCursorView.showSelections();
+ }
+ });
+ }
+
+ public void hideSelections() {
+ LOKitShell.getMainHandler().post(new Runnable() {
+ public void run() {
+ mCursorView.hideSelections();
+ }
+ });
+ }
+
public void changeSelections(final List<RectF> selections) {
LOKitShell.getMainHandler().post(new Runnable() {
public void run() {
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorView.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorView.java
index f1e9038..685e8c3 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorView.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorView.java
@@ -36,6 +36,7 @@ public class TextCursorView extends View {
private Paint mSelectionPaint = new Paint();
private boolean mCursorVisible;
+ private boolean mSelectionsVisible;
public TextCursorView(Context context) {
super(context);
@@ -57,13 +58,14 @@ public class TextCursorView extends View {
postDelayed(cursorAnimation, 500);
mCursorPaint.setColor(Color.BLACK);
- mCursorPaint.setAlpha(0);
+ mCursorPaint.setAlpha(0xFF);
mCursorVisible = false;
mSelectionPaint.setColor(Color.BLUE);
mSelectionPaint.setAlpha(50);
+ mSelectionsVisible = false;
mInitialized = true;
}
}
@@ -110,10 +112,13 @@ public class TextCursorView extends View {
@Override
protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
- canvas.drawRect(mCursorScaledPosition, mCursorPaint);
-
- for (RectF selection : mScaledSelections) {
- canvas.drawRect(selection, mSelectionPaint);
+ if (mCursorVisible) {
+ canvas.drawRect(mCursorScaledPosition, mCursorPaint);
+ }
+ if (mSelectionsVisible) {
+ for (RectF selection : mScaledSelections) {
+ canvas.drawRect(selection, mSelectionPaint);
+ }
}
}
@@ -129,13 +134,21 @@ public class TextCursorView extends View {
public void showCursor() {
mCursorVisible = true;
- mCursorPaint.setAlpha(0xFF);
invalidate();
}
public void hideCursor() {
mCursorVisible = false;
- mCursorPaint.setAlpha(0);
+ invalidate();
+ }
+
+ public void showSelections() {
+ mSelectionsVisible = true;
+ invalidate();
+ }
+
+ public void hideSelections() {
+ mSelectionsVisible = false;
invalidate();
}
}
\ No newline at end of file
commit bbb857c1d3a7c1e5e9f2548e63fb8a80807f1ee3
Author: Siqi Liu <me at siqi.fr>
Date: Sun Mar 8 23:11:16 2015 +0100
tdf#89705 hyperlink clickable in writer (not in impress, yet)
Change-Id: Ifaa6c0de7d9b91706985667b72195bcfc2d610cd
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 489aeba..a2bb960 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -66,6 +66,8 @@
#include <xmloff/odffields.hxx>
#include <boost/scoped_ptr.hpp>
+#include <LibreOfficeKit/LibreOfficeKitEnums.h>
+
void SwWrtShell::Insert(SwField &rFld)
{
ResetCursorStack();
@@ -469,9 +471,17 @@ void LoadURL( SwViewShell& rVSh, const OUString& rURL, sal_uInt16 nFilter,
if ( !rVSh.ISA(SwCrsrShell) )
return;
+ // We are doing tiledRendering, let the client handles the URL loading.
+ if (rVSh.isTiledRendering()) {
+ rVSh.libreOfficeKitCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
+ OUStringToOString(rURL, RTL_TEXTENCODING_UTF8).getStr());
+ return;
+ }
+
//A CrsrShell is always a WrtShell
SwWrtShell &rSh = static_cast<SwWrtShell&>(rVSh);
+
SwDocShell* pDShell = rSh.GetView().GetDocShell();
OSL_ENSURE( pDShell, "No DocShell?!");
OUString sTargetFrame(rTargetFrameName);
commit 3650a9f0cee4c3f15c35f5966e4a58ca67500346
Author: Jan Holesovsky <kendy at collabora.com>
Date: Sat Mar 7 00:48:03 2015 +0100
sc tiled mouse events: Proof-of-concept.
One has to click & press enter to be able to type into the cell. The typing
is visible only in the top left tile, but even in the other tiles, the text
gets there - when you manage to invalidate everything, the text appears.
Change-Id: I7c9c0a52949a514eb3de7a7fe64f11597377d39f
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 7b10600..4e86b83 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -367,7 +367,7 @@ public:
virtual sal_Int32 SAL_CALL getFormulaCellNumberLimit()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- // @see vcl::ITiledRenderable::paintTile().
+ /// @see vcl::ITiledRenderable::paintTile().
virtual void paintTile( VirtualDevice& rDevice,
int nOutputWidth,
int nOutputHeight,
@@ -376,21 +376,24 @@ public:
long nTileWidth,
long nTileHeight ) SAL_OVERRIDE;
- // @see vcl::ITiledRenderable::getDocumentSize().
+ /// @see vcl::ITiledRenderable::getDocumentSize().
virtual Size getDocumentSize() SAL_OVERRIDE;
- // @see vcl::ITiledRenderable::setPart().
+ /// @see vcl::ITiledRenderable::setPart().
virtual void setPart(int nPart) SAL_OVERRIDE;
- // @see vcl::ITiledRenderable::getPart().
+ /// @see vcl::ITiledRenderable::getPart().
virtual int getPart() SAL_OVERRIDE;
- // @see vcl::ITiledRenderable::getParts().
+ /// @see vcl::ITiledRenderable::getParts().
virtual int getParts() SAL_OVERRIDE;
- // @see vcl::ITiledRenderable::registerCallback().
+ /// @see vcl::ITiledRenderable::registerCallback().
virtual void registerCallback(LibreOfficeKitCallback pCallback, void* pData) SAL_OVERRIDE;
+ /// @see vcl::ITiledRenderable::postMouseEvent().
+ virtual void postMouseEvent(int nType, int nX, int nY, int nCount) SAL_OVERRIDE;
+
/// @see vcl::ITiledRenderable::initializeForTiledRendering().
virtual void initializeForTiledRendering() SAL_OVERRIDE;
};
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 7bc053d..56498ab 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -325,6 +325,12 @@ public:
/// @see OutputDevice::LogicInvalidate().
void LogicInvalidate(const ::vcl::Region* pRegion) SAL_OVERRIDE;
+ /// Same as MouseButtonDown(), but coordinates are in logic unit.
+ void LogicMouseButtonDown(const MouseEvent& rMouseEvent);
+
+ /// Same as MouseButtonUp(), but coordinates are in logic unit.
+ void LogicMouseButtonUp(const MouseEvent& rMouseEvent);
+
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
void FakeButtonUp();
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index daa8f49..6e916b3 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -27,6 +27,7 @@
#include <svx/svxids.hrc>
#include <svx/unoshape.hxx>
+#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <officecfg/Office/Common.hxx>
#include <officecfg/Office/Calc.hxx>
#include <svl/numuno.hxx>
@@ -518,6 +519,35 @@ void ScModelObj::registerCallback(LibreOfficeKitCallback pCallback, void* pData)
pDocShell->GetDocument().GetDrawLayer()->registerLibreOfficeKitCallback(pCallback, pData);
}
+void ScModelObj::postMouseEvent(int nType, int nX, int nY, int nCount)
+{
+ SolarMutexGuard aGuard;
+
+ // There seems to be no clear way of getting the grid window for this
+ // particular document, hence we need to hope we get the right window.
+ ScViewData* pViewData = ScDocShell::GetViewData();
+ ScGridWindow* pGridWindow = pViewData->GetActiveWin();
+
+ if (!pGridWindow)
+ return;
+
+ // Calc operates in pixels...
+ MouseEvent aEvent(Point(nX / TWIPS_PER_PIXEL, nY / TWIPS_PER_PIXEL), nCount, MouseEventModifiers::SIMPLECLICK, MOUSE_LEFT);
+
+ switch (nType)
+ {
+ case LOK_MOUSEEVENT_MOUSEBUTTONDOWN:
+ pGridWindow->LogicMouseButtonDown(aEvent);
+ break;
+ case LOK_MOUSEEVENT_MOUSEBUTTONUP:
+ pGridWindow->LogicMouseButtonUp(aEvent);
+ break;
+ default:
+ assert(false);
+ break;
+ }
+}
+
void ScModelObj::initializeForTiledRendering()
{
SolarMutexGuard aGuard;
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index b65c209..d980dfc 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2416,6 +2416,26 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
}
}
+void ScGridWindow::LogicMouseButtonDown(const MouseEvent& rMouseEvent)
+{
+ // When we're not doing tiled rendering, then positions must be passed as pixels.
+ ScDocShell* pDocSh = pViewData->GetDocShell();
+ ScDocument& rDoc = pDocSh->GetDocument();
+ assert(rDoc.GetDrawLayer()->isTiledRendering());
+
+ MouseButtonDown(rMouseEvent);
+}
+
+void ScGridWindow::LogicMouseButtonUp(const MouseEvent& rMouseEvent)
+{
+ // When we're not doing tiled rendering, then positions must be passed as pixels.
+ ScDocShell* pDocSh = pViewData->GetDocShell();
+ ScDocument& rDoc = pDocSh->GetDocument();
+ assert(rDoc.GetDrawLayer()->isTiledRendering());
+
+ MouseButtonUp(rMouseEvent);
+}
+
void ScGridWindow::FakeButtonUp()
{
if ( nButtonDown )
commit 81dd0c411d80eed9ccc0b61572800cbdf2226a3b
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Mar 6 22:27:27 2015 +0100
sc tiled rendering: Simplify the zoom computation.
In principle, we should avoid messing up with zoom, and instead just work with
the MapMode, but we are not there yet - lots of places are hardcoded to work
in pixels.
Change-Id: I572b0d54fbfc72494c44ef95e7fda5e655f83fde
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 56a3aa0..22d4171 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -927,22 +927,18 @@ void ScGridWindow::PaintTile( VirtualDevice& rDevice,
// FIXME the painting works using a mixture of drawing with coordinates in
// pixels and in logic coordinates; it should be cleaned up to use logic
- // coords only.
+ // coords only, and avoid all the SetMapMode()'s.
+ // Similarly to Writer, we should set the mapmode once on the rDevice, and
+ // not care about any zoom settings.
- // TODO : zooming isn't perfect. Find out why.
- double nOutWTwips = static_cast<double>(nOutputWidth) / PIXEL_PER_TWIPS;
- double nOutHTwips = static_cast<double>(nOutputHeight) / PIXEL_PER_TWIPS;
-
- nOutWTwips /= nTileWidth;
- nOutHTwips /= nTileHeight;
- Fraction aFracX(nOutWTwips);
- Fraction aFracY(nOutHTwips);
+ Fraction aFracX(long(nOutputWidth * TWIPS_PER_PIXEL), nTileWidth);
+ Fraction aFracY(long(nOutputHeight * TWIPS_PER_PIXEL), nTileHeight);
pViewData->SetZoom(aFracX, aFracY, true);
pViewData->RefreshZoom();
- double fTilePosXPixel = static_cast<double>(nTilePosX) * PIXEL_PER_TWIPS * static_cast<double>(aFracX);
- double fTilePosYPixel = static_cast<double>(nTilePosY) * PIXEL_PER_TWIPS * static_cast<double>(aFracY);
+ double fTilePosXPixel = static_cast<double>(nTilePosX) * nOutputWidth / nTileWidth;
+ double fTilePosYPixel = static_cast<double>(nTilePosY) * nOutputHeight / nTileHeight;
SCTAB nTab = pViewData->GetTabNo();
ScDocument* pDoc = pViewData->GetDocument();
@@ -957,7 +953,9 @@ void ScGridWindow::PaintTile( VirtualDevice& rDevice,
ScTableInfo aTabInfo;
pDoc->FillInfo(aTabInfo, nCol1, nRow1, nCol2, nRow2, nTab, fPPTX, fPPTY, false, false, NULL);
- ScOutputData aOutputData(&rDevice, OUTTYPE_WINDOW, aTabInfo, pDoc, nTab, -fTilePosXPixel, -fTilePosYPixel, nCol1, nRow1, nCol2, nRow2, fPPTX, fPPTY);
+ ScOutputData aOutputData(&rDevice, OUTTYPE_WINDOW, aTabInfo, pDoc, nTab,
+ -fTilePosXPixel, -fTilePosYPixel, nCol1, nRow1, nCol2, nRow2,
+ fPPTX, fPPTY);
DrawContent(rDevice, aTabInfo, aOutputData, true, SC_UPDATE_ALL);
}
commit a812c8754572a0edb45777ec291b7453b45d6e16
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Mar 6 22:00:15 2015 +0100
sc tiled rendering: Make the drawings and charts work.
Change-Id: Ibd7e9e398fe24ec2b3553c8488b46b65de316da6
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 17a255f..7bc053d 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -375,6 +375,7 @@ public:
bool ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard );
void HideNoteMarker();
+ /// MapMode for the drawinglayer objects.
MapMode GetDrawMapMode( bool bForce = false );
void ContinueDrag();
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index d605d53..d9e1a46 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -60,6 +60,7 @@ class ScFieldEditEngine;
class ScOutputData
{
friend class ScDrawStringsVars;
+friend class ScGridWindow;
private:
struct OutputAreaParam
{
@@ -147,7 +148,6 @@ private:
RowInfo* pRowInfo; // Info block
SCSIZE nArrCount; // occupied lines in info block
ScDocument* mpDoc; // Document
-public:
SCTAB nTab; // sheet
long nScrX; // Output Startpos. (Pixel)
long nScrY;
@@ -158,7 +158,6 @@ public:
SCROW nY1; // ( incl. hidden )
SCCOL nX2;
SCROW nY2;
-private:
SCCOL nVisX1; // Start-/End coordinates
SCROW nVisY1; // ( visible range )
SCCOL nVisX2;
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 0deb69e..56a3aa0 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -531,6 +531,7 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
ScDocShell* pDocSh = pViewData->GetDocShell();
ScDocument& rDoc = pDocSh->GetDocument();
const ScViewOptions& rOpts = pViewData->GetOptions();
+ bool bIsTiledRendering = rDoc.GetDrawLayer()->isTiledRendering();
SCTAB nTab = aOutputData.nTab;
SCCOL nX1 = aOutputData.nX1;
@@ -595,7 +596,15 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
}
// define drawing layer map mode and paint rectangle
- const MapMode aDrawMode = GetDrawMapMode();
+ MapMode aDrawMode = GetDrawMapMode();
+ if (bIsTiledRendering)
+ {
+ // FIXME this shouldn't be necessary once we change this to work in the
+ // logic coordinates instead of in pixels (and get rid of all the
+ // SetMapMode()'s)
+ aDrawMode = pViewData->GetLogicMode(eWhich);
+ aDrawMode.SetOrigin(PixelToLogic(Point(nScrX, nScrY), aDrawMode));
+ }
Rectangle aDrawingRectLogic;
bool bLayoutRTL = rDoc.IsLayoutRTL( nTab );
@@ -628,7 +637,6 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
OutputDevice* pContentDev = &rDevice; // device for document content, used by overlay manager
SdrPaintWindow* pTargetPaintWindow = 0; // #i74769# work with SdrPaintWindow directly
- bool bIsTiledRendering = rDoc.GetDrawLayer()->isTiledRendering();
if (!bIsTiledRendering)
{
@@ -894,10 +902,10 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
flushOverlayManager();
// set MapMode for text edit
- SetMapMode(pViewData->GetLogicMode());
+ rDevice.SetMapMode(pViewData->GetLogicMode());
}
else
- SetMapMode(aDrawMode);
+ rDevice.SetMapMode(aDrawMode);
if ( pNoteMarker )
pNoteMarker->Draw(); // ueber den Cursor, im Drawing-MapMode
@@ -917,6 +925,10 @@ void ScGridWindow::PaintTile( VirtualDevice& rDevice,
// dependent of the zoom level. Determine the correct zoom level before
// we start.
+ // FIXME the painting works using a mixture of drawing with coordinates in
+ // pixels and in logic coordinates; it should be cleaned up to use logic
+ // coords only.
+
// TODO : zooming isn't perfect. Find out why.
double nOutWTwips = static_cast<double>(nOutputWidth) / PIXEL_PER_TWIPS;
double nOutHTwips = static_cast<double>(nOutputHeight) / PIXEL_PER_TWIPS;
commit 6cf7e174f1b4be1d96ede151bb16af2e65878459
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Mar 6 18:47:29 2015 +0100
Kill this return.
Change-Id: Ic05fbba4f431d9ccbe09377ec02e8eb84e3d3b17
diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx
index 91c8da8..f2b0a05 100644
--- a/sc/source/ui/view/output3.cxx
+++ b/sc/source/ui/view/output3.cxx
@@ -213,9 +213,6 @@ void ScOutputData::DrawSelectiveObjects(const sal_uInt16 nLayer)
}
mpDev->SetDrawMode(nOldDrawMode);
-
- // #109985#
- return;
}
// Teile nur fuer Bildschirm
commit 31df8a295e7c1be14a064e313ff623e1e4a7f8bb
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Mar 6 18:21:02 2015 +0100
sc tiled rendering: tdf#85848: Use DrawContent() in PaintTile() too.
From now on, the code for the tiled rendering is shared with the desktop
rendering, modulo few isTiledRendering() calls.
Drawing of the shapes & charts needs fixing, it does not honor the
output device settings.
Change-Id: I74cdb4e09da59aa71f31b18130829de28a93fab4
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 314df1d..0deb69e 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -382,6 +382,16 @@ void ScGridWindow::Paint( const Rectangle& rRect )
void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMode eMode )
{
+ ScDocShell* pDocSh = pViewData->GetDocShell();
+ ScDocument& rDoc = pDocSh->GetDocument();
+
+ // let's ignore the normal Draw() attempts when doing the tiled rendering,
+ // all the rendering should go through PaintTile() in that case.
+ // TODO revisit if we can actually turn this into an assert(), and clean
+ // up the callers
+ if (rDoc.GetDrawLayer()->isTiledRendering())
+ return;
+
ScModule* pScMod = SC_MOD();
bool bTextWysiwyg = pScMod->GetInputOptions().GetTextWysiwyg();
@@ -418,10 +428,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
++nPaintCount; // merken, dass gemalt wird (wichtig beim Invertieren)
- ScDocShell* pDocSh = pViewData->GetDocShell();
- ScDocument& rDoc = pDocSh->GetDocument();
SCTAB nTab = pViewData->GetTabNo();
-
rDoc.ExtendHidden( nX1, nY1, nX2, nY2, nTab );
Point aScrPos = pViewData->GetScrPos( nX1, nY1, eWhich );
@@ -619,9 +626,11 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
aDrawingRectLogic = PixelToLogic(aDrawingRectPixel, aDrawMode);
}
- OutputDevice* pContentDev = this; // device for document content, used by overlay manager
+ OutputDevice* pContentDev = &rDevice; // device for document content, used by overlay manager
SdrPaintWindow* pTargetPaintWindow = 0; // #i74769# work with SdrPaintWindow directly
+ bool bIsTiledRendering = rDoc.GetDrawLayer()->isTiledRendering();
+ if (!bIsTiledRendering)
{
// init redraw
ScTabViewShell* pTabViewShell = pViewData->GetViewShell();
@@ -832,6 +841,7 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
}
}
+ if (!bIsTiledRendering)
{
// end redraw
ScTabViewShell* pTabViewShell = pViewData->GetViewShell();
@@ -858,25 +868,24 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
if ( bEditMode && (pViewData->GetRefTabNo() == pViewData->GetTabNo()) )
{
//! use pContentDev for EditView?
- SetMapMode(MAP_PIXEL);
+ rDevice.SetMapMode(MAP_PIXEL);
SCCOL nCol1 = pViewData->GetEditStartCol();
SCROW nRow1 = pViewData->GetEditStartRow();
SCCOL nCol2 = pViewData->GetEditEndCol();
SCROW nRow2 = pViewData->GetEditEndRow();
- SetLineColor();
- SetFillColor( pEditView->GetBackgroundColor() );
+ rDevice.SetLineColor();
+ rDevice.SetFillColor(pEditView->GetBackgroundColor());
Point aStart = pViewData->GetScrPos( nCol1, nRow1, eWhich );
Point aEnd = pViewData->GetScrPos( nCol2+1, nRow2+1, eWhich );
long nLayoutSign = bLayoutRTL ? -1 : 1;
aEnd.X() -= 2 * nLayoutSign; // don't overwrite grid
aEnd.Y() -= 2;
- DrawRect( Rectangle( aStart,aEnd ) );
+ rDevice.DrawRect(Rectangle(aStart, aEnd));
- SetMapMode(pViewData->GetLogicMode());
- pEditView->Paint( PixelToLogic( Rectangle( Point( nScrX, nScrY ),
- Size( aOutputData.GetScrW(), aOutputData.GetScrH() ) ) ) );
- SetMapMode(MAP_PIXEL);
+ rDevice.SetMapMode(pViewData->GetLogicMode());
+ pEditView->Paint(PixelToLogic(Rectangle(Point(nScrX, nScrY), Size(aOutputData.GetScrW(), aOutputData.GetScrH()))), &rDevice);
+ rDevice.SetMapMode(MAP_PIXEL);
}
if (pViewData->HasEditView(eWhich))
@@ -936,74 +945,9 @@ void ScGridWindow::PaintTile( VirtualDevice& rDevice,
ScTableInfo aTabInfo;
pDoc->FillInfo(aTabInfo, nCol1, nRow1, nCol2, nRow2, nTab, fPPTX, fPPTY, false, false, NULL);
- ScOutputData aOutData(
- &rDevice, OUTTYPE_WINDOW, aTabInfo, pDoc, nTab, -fTilePosXPixel, -fTilePosYPixel, nCol1, nRow1, nCol2, nRow2, fPPTX, fPPTY);
-
- const svtools::ColorConfig& rColorCfg = SC_MOD()->GetColorConfig();
- Color aGridColor = rColorCfg.GetColorValue(svtools::CALCGRID, false).nColor;
- if (aGridColor.GetColor() == COL_TRANSPARENT)
- {
- // use view options' grid color only if color config has "automatic" color
- const ScViewOptions& rOpts = pViewData->GetOptions();
- aGridColor = rOpts.GetGridColor();
- }
- aOutData.SetGridColor(aGridColor);
-
- aOutData.DrawClear();
- aOutData.DrawDocumentBackground();
- aOutData.DrawBackground();
- aOutData.DrawGrid(true, false);
-
- aOutData.DrawShadow();
- aOutData.DrawFrame();
-
- // Set scaling to map mode only for text rendering, to get texts to scale
- // correctly.
- MapMode aOldMapMode = rDevice.GetMapMode();
- MapMode aNewMapMode = aOldMapMode;
- aNewMapMode.SetScaleX(aFracX);
- aNewMapMode.SetScaleY(aFracY);
- rDevice.SetMapMode(aNewMapMode);
+ ScOutputData aOutputData(&rDevice, OUTTYPE_WINDOW, aTabInfo, pDoc, nTab, -fTilePosXPixel, -fTilePosYPixel, nCol1, nRow1, nCol2, nRow2, fPPTX, fPPTY);
- aOutData.DrawStrings(true);
-
- // Edit texts need 1/100mm map mode to be rendered correctly.
- aNewMapMode.SetMapUnit(MAP_100TH_MM);
- rDevice.SetMapMode(aNewMapMode);
- aOutData.DrawEdit(true);
-
- rDevice.SetMapMode(aOldMapMode);
-
- EditView* pEditView = NULL;
- {
- SCCOL nEditCol;
- SCROW nEditRow;
- pViewData->GetEditView( eWhich, pEditView, nEditCol, nEditRow );
- }
- // InPlace Edit-View
- // moved after EndDrawLayers() to get it outside the overlay buffer and
- // on top of everything
- if (pEditView)
- {
- //! use pContentDev for EditView?
- rDevice.SetMapMode(MAP_PIXEL);
- SCCOL nEditCol1 = pViewData->GetEditStartCol();
- SCROW nEditRow1 = pViewData->GetEditStartRow();
- SCCOL nEditCol2 = pViewData->GetEditEndCol();
- SCROW nEditRow2 = pViewData->GetEditEndRow();
- rDevice.SetLineColor();
- rDevice.SetFillColor( pEditView->GetBackgroundColor() );
- Point aStart = pViewData->GetScrPos( nEditCol1, nEditRow1, eWhich );
- Point aEnd = pViewData->GetScrPos( nEditCol2+1, nEditRow2+1, eWhich );
- aEnd.X() -= 2; // don't overwrite grid
- aEnd.Y() -= 2;
- rDevice.DrawRect( Rectangle( aStart,aEnd ) );
-
- rDevice.SetMapMode(pViewData->GetLogicMode());
- pEditView->Paint( PixelToLogic( Rectangle( Point( fTilePosXPixel, fTilePosYPixel ),
- Size( aOutData.GetScrW(), aOutData.GetScrH() ) ) ), &rDevice );
- rDevice.SetMapMode(MAP_PIXEL);
- }
+ DrawContent(rDevice, aTabInfo, aOutputData, true, SC_UPDATE_ALL);
}
void ScGridWindow::LogicInvalidate(const ::vcl::Region* pRegion)
commit d38c2cd2d51212dfcd50197d6a86c61dd74dcb68
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Mar 6 16:44:46 2015 +0100
sc tiled rendering: Split ScGridWindow::Draw() to setup and drawing.
The drawing part is planned to be shared with the tiled rendering, while the
setup part has to be different.
Change-Id: I9101111d44f4602cdb92916ff3889b52bf10a8bf
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 712fb72..17a255f 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -355,12 +355,15 @@ public:
::com::sun::star::sheet::DataPilotFieldOrientation GetDPFieldOrientation( SCCOL nCol, SCROW nRow ) const;
- void DrawButtons( SCCOL nX1, SCCOL nX2, ScTableInfo& rTabInfo, OutputDevice* pContentDev);
+ void DrawButtons(SCCOL nX1, SCCOL nX2, const ScTableInfo& rTabInfo, OutputDevice* pContentDev);
using Window::Draw;
void Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
ScUpdateMode eMode = SC_UPDATE_ALL );
+ /// Draw content of the gridwindow; shared between the desktop and the tiled rendering.
+ void DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableInfo, ScOutputData& aOutputData, bool bLogicText, ScUpdateMode eMode);
+
void CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddress);
void HideCursor();
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index ffb6bea..d605d53 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -147,6 +147,7 @@ private:
RowInfo* pRowInfo; // Info block
SCSIZE nArrCount; // occupied lines in info block
ScDocument* mpDoc; // Document
+public:
SCTAB nTab; // sheet
long nScrX; // Output Startpos. (Pixel)
long nScrY;
@@ -157,6 +158,7 @@ private:
SCROW nY1; // ( incl. hidden )
SCCOL nX2;
SCROW nY2;
+private:
SCCOL nVisX1; // Start-/End coordinates
SCROW nVisY1; // ( visible range )
SCCOL nVisX2;
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 17f1ae0..314df1d 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -427,7 +427,6 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
Point aScrPos = pViewData->GetScrPos( nX1, nY1, eWhich );
long nMirrorWidth = GetSizePixel().Width();
bool bLayoutRTL = rDoc.IsLayoutRTL( nTab );
- long nLayoutSign = bLayoutRTL ? -1 : 1;
if ( bLayoutRTL )
{
long nEndPixel = pViewData->GetScrPos( nX2+1, maVisibleRange.mnRow1, eWhich ).X();
@@ -463,14 +462,12 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
double nPPTY = pViewData->GetPPTY();
const ScViewOptions& rOpts = pViewData->GetOptions();
- bool bFormulaMode = rOpts.GetOption( VOPT_FORMULAS );
- bool bMarkClipped = rOpts.GetOption( VOPT_CLIPMARKS );
// Datenblock
ScTableInfo aTabInfo;
rDoc.FillInfo( aTabInfo, nX1, nY1, nX2, nY2, nTab,
- nPPTX, nPPTY, false, bFormulaMode,
+ nPPTX, nPPTY, false, rOpts.GetOption(VOPT_FORMULAS),
&pViewData->GetMarkData() );
Fraction aZoomX = pViewData->GetZoomX();
@@ -505,6 +502,37 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
bLogicText = true; // use logic MapMode
}
+ DrawContent(*this, aTabInfo, aOutputData, bLogicText, eMode);
+
+ // Wenn waehrend des Paint etwas invertiert wurde (Selektion geaendert aus Basic-Macro),
+ // ist das jetzt durcheinandergekommen und es muss neu gemalt werden
+
+ OSL_ENSURE(nPaintCount, "nPaintCount falsch");
+ --nPaintCount;
+ if (!nPaintCount)
+ CheckNeedsRepaint();
+
+ // Flag drawn formula cells "unchanged".
+ rDoc.ResetChanged(ScRange(nX1, nY1, nTab, nX2, nY2, nTab));
+ rDoc.ClearFormulaContext();
+}
+
+void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableInfo, ScOutputData& aOutputData,
+ bool bLogicText, ScUpdateMode eMode)
+{
+ ScModule* pScMod = SC_MOD();
+ ScDocShell* pDocSh = pViewData->GetDocShell();
+ ScDocument& rDoc = pDocSh->GetDocument();
+ const ScViewOptions& rOpts = pViewData->GetOptions();
+
+ SCTAB nTab = aOutputData.nTab;
+ SCCOL nX1 = aOutputData.nX1;
+ SCROW nY1 = aOutputData.nY1;
+ SCCOL nX2 = aOutputData.nX2;
+ SCROW nY2 = aOutputData.nY2;
+ long nScrX = aOutputData.nScrX;
+ long nScrY = aOutputData.nScrY;
+
const svtools::ColorConfig& rColorCfg = pScMod->GetColorConfig();
Color aGridColor( rColorCfg.GetColorValue( svtools::CALCGRID, false ).nColor );
if ( aGridColor.GetColor() == COL_TRANSPARENT )
@@ -516,9 +544,9 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
aOutputData.SetSyntaxMode ( pViewData->IsSyntaxMode() );
aOutputData.SetGridColor ( aGridColor );
aOutputData.SetShowNullValues ( rOpts.GetOption( VOPT_NULLVALS ) );
- aOutputData.SetShowFormulas ( bFormulaMode );
+ aOutputData.SetShowFormulas ( rOpts.GetOption( VOPT_FORMULAS ) );
aOutputData.SetShowSpellErrors ( rDoc.GetDocOptions().IsAutoSpell() );
- aOutputData.SetMarkClipped ( bMarkClipped );
+ aOutputData.SetMarkClipped ( rOpts.GetOption( VOPT_CLIPMARKS ) );
aOutputData.SetUseStyleColor( true ); // always set in table view
@@ -562,6 +590,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
// define drawing layer map mode and paint rectangle
const MapMode aDrawMode = GetDrawMapMode();
Rectangle aDrawingRectLogic;
+ bool bLayoutRTL = rDoc.IsLayoutRTL( nTab );
{
// get drawing pixel rect
@@ -704,13 +733,13 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
pContentDev->SetMapMode(pViewData->GetLogicMode(eWhich));
if ( bLogicText )
- aOutputData.DrawStrings(true); // in logic MapMode if bTextWysiwyg is set
+ aOutputData.DrawStrings(true); // in logic MapMode if bLogicText is set
aOutputData.DrawEdit(true);
pContentDev->SetMapMode(MAP_PIXEL);
// Autofilter- und Pivot-Buttons
- DrawButtons( nX1, nX2, aTabInfo, pContentDev ); // Pixel
+ DrawButtons(nX1, nX2, rTableInfo, pContentDev); // Pixel
// Notiz-Anzeiger
@@ -838,6 +867,8 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
SetFillColor( pEditView->GetBackgroundColor() );
Point aStart = pViewData->GetScrPos( nCol1, nRow1, eWhich );
Point aEnd = pViewData->GetScrPos( nCol2+1, nRow2+1, eWhich );
+
+ long nLayoutSign = bLayoutRTL ? -1 : 1;
aEnd.X() -= 2 * nLayoutSign; // don't overwrite grid
aEnd.Y() -= 2;
DrawRect( Rectangle( aStart,aEnd ) );
@@ -861,18 +892,6 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
if ( pNoteMarker )
pNoteMarker->Draw(); // ueber den Cursor, im Drawing-MapMode
-
- // Wenn waehrend des Paint etwas invertiert wurde (Selektion geaendert aus Basic-Macro),
- // ist das jetzt durcheinandergekommen und es muss neu gemalt werden
-
- OSL_ENSURE(nPaintCount, "nPaintCount falsch");
- --nPaintCount;
- if (!nPaintCount)
- CheckNeedsRepaint();
-
- // Flag drawn formula cells "unchanged".
- rDoc.ResetChanged(ScRange(nX1,nY1,nTab,nX2,nY2,nTab));
- rDoc.ClearFormulaContext();
}
void ScGridWindow::PaintTile( VirtualDevice& rDevice,
@@ -1219,7 +1238,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
}
}
-void ScGridWindow::DrawButtons( SCCOL nX1, SCCOL nX2, ScTableInfo& rTabInfo, OutputDevice* pContentDev)
+void ScGridWindow::DrawButtons(SCCOL nX1, SCCOL nX2, const ScTableInfo& rTabInfo, OutputDevice* pContentDev)
{
aComboButton.SetOutputDevice( pContentDev );
commit 658f762dcdb80e73fc9007756f9dff801d3bd452
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Mar 6 18:23:58 2015 +0100
sdr::overlay::OverlayObjectList: when tiled rendering, don't work with pixels
Change-Id: Iaf7c31db65ecc4945f9d19e9031632443fa3823f
diff --git a/include/svx/sdr/overlay/overlayobjectlist.hxx b/include/svx/sdr/overlay/overlayobjectlist.hxx
index a3bda78..57f6860 100644
--- a/include/svx/sdr/overlay/overlayobjectlist.hxx
+++ b/include/svx/sdr/overlay/overlayobjectlist.hxx
@@ -27,6 +27,7 @@
#define DEFAULT_VALUE_FOR_HITTEST_PIXEL (2L)
+#define DEFAULT_VALUE_FOR_HITTEST_TWIP (30L)
diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx
index 5b949c3..16c9264 100644
--- a/svx/source/sdr/overlay/overlayobjectlist.cxx
+++ b/svx/source/sdr/overlay/overlayobjectlist.cxx
@@ -19,6 +19,7 @@
#include <svx/sdr/overlay/overlayobjectlist.hxx>
#include <svx/sdr/overlay/overlaymanager.hxx>
+#include <svx/svdmodel.hxx>
#include <vcl/outdev.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <tools/gen.hxx>
@@ -72,8 +73,13 @@ namespace sdr
{
if(0.0 == fLogicTolerance)
{
- const Size aSizeLogic(pManager->getOutputDevice().PixelToLogic(
+ Size aSizeLogic(pManager->getOutputDevice().PixelToLogic(
Size(DEFAULT_VALUE_FOR_HITTEST_PIXEL, DEFAULT_VALUE_FOR_HITTEST_PIXEL)));
+
+ // When tiled rendering, we always work in twips, use the non-pixel default.
+ if (pManager->getModel()->isTiledRendering())
+ aSizeLogic = Size(DEFAULT_VALUE_FOR_HITTEST_TWIP, DEFAULT_VALUE_FOR_HITTEST_TWIP);
+
fLogicTolerance = aSizeLogic.Width();
}
commit 7c1a2289d55aa9f92286c2c9eee0a394e9ea7d29
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Mar 6 17:36:16 2015 +0100
Add sdr::overlay::OverlayManager::getModel()
Can't access the SdrModel from sdr::overlay::OverlayObjectList
otherwise.
Change-Id: I0530985fb79659bd9de95d944b06edfb883f4403
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index 637112a..c6c0334 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -36,6 +36,7 @@
// predeclarations
class OutputDevice;
+class SdrModel;
namespace vcl { class Region; }
namespace sdr { namespace overlay {
@@ -63,6 +64,7 @@ namespace sdr
protected:
// the OutputDevice to work on, set on construction and not to be changed
OutputDevice& mrOutputDevice;
+ const SdrModel* mpModel;
// the vector of registered OverlayObjects
OverlayObjectVector maOverlayObjects;
@@ -92,11 +94,11 @@ namespace sdr
// ViewTransformation and evtl. correct mfDiscreteOne
double getDiscreteOne() const;
- OverlayManager(OutputDevice& rOutputDevice);
+ OverlayManager(OutputDevice& rOutputDevice, const SdrModel* pModel);
virtual ~OverlayManager();
public:
- static rtl::Reference<OverlayManager> create(OutputDevice& rOutputDevice);
+ static rtl::Reference<OverlayManager> create(OutputDevice& rOutputDevice, const SdrModel* pModel);
// access to current ViewInformation2D; this call checks and evtl. updates ViewInformation2D
const drawinglayer::geometry::ViewInformation2D getCurrentViewInformation2D() const;
@@ -115,6 +117,8 @@ namespace sdr
// get the OutputDevice
OutputDevice& getOutputDevice() const { return mrOutputDevice; }
+ // Get the draw model.
+ const SdrModel* getModel() const { return mpModel; }
// add and remove OverlayObjects
void add(OverlayObject& rOverlayObject);
diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
index 35c8d66..4063d52 100644
--- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
@@ -64,11 +64,13 @@ namespace sdr
OverlayManagerBuffered(
OutputDevice& rOutputDevice,
+ const SdrModel* pModel,
bool bRefreshWithPreRendering = false);
virtual ~OverlayManagerBuffered();
public:
static rtl::Reference<OverlayManager> create(OutputDevice& rOutputDevice,
+ const SdrModel* pModel,
bool bRefreshWithPreRendering = false);
// complete redraw
diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx
index 38b3ebb..585e019 100644
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -115,9 +115,10 @@ namespace sdr
return mfDiscreteOne;
}
- OverlayManager::OverlayManager(OutputDevice& rOutputDevice)
+ OverlayManager::OverlayManager(OutputDevice& rOutputDevice, const SdrModel* pModel)
: Scheduler(),
mrOutputDevice(rOutputDevice),
+ mpModel(pModel),
maOverlayObjects(),
maStripeColorA(Color(COL_BLACK)),
maStripeColorB(Color(COL_WHITE)),
@@ -140,9 +141,9 @@ namespace sdr
}
}
- rtl::Reference<OverlayManager> OverlayManager::create(OutputDevice& rOutputDevice)
+ rtl::Reference<OverlayManager> OverlayManager::create(OutputDevice& rOutputDevice, const SdrModel* pModel)
{
- return rtl::Reference<OverlayManager>(new OverlayManager(rOutputDevice));
+ return rtl::Reference<OverlayManager>(new OverlayManager(rOutputDevice, pModel));
}
const drawinglayer::geometry::ViewInformation2D OverlayManager::getCurrentViewInformation2D() const
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 8c3a5d1..8766b5a 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -424,8 +424,9 @@ namespace sdr
OverlayManagerBuffered::OverlayManagerBuffered(
OutputDevice& rOutputDevice,
+ const SdrModel* pModel,
bool bRefreshWithPreRendering)
- : OverlayManager(rOutputDevice),
+ : OverlayManager(rOutputDevice, pModel),
mbRefreshWithPreRendering(bRefreshWithPreRendering)
{
// Init timer
@@ -435,9 +436,11 @@ namespace sdr
rtl::Reference<OverlayManager> OverlayManagerBuffered::create(
OutputDevice& rOutputDevice,
+ const SdrModel* pModel,
bool bRefreshWithPreRendering)
{
return rtl::Reference<OverlayManager>(new OverlayManagerBuffered(rOutputDevice,
+ pModel,
bRefreshWithPreRendering));
}
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index ae6f6d5..8692c53 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -209,7 +209,7 @@ void SdrPaintWindow::impCreateOverlayManager()
// whether that refresh itself will use a 2nd vdev to avoid flickering.
// Also hand over the old OverlayManager if existent; this means to take over
// the registered OverlayObjects from it
- mxOverlayManager = ::sdr::overlay::OverlayManagerBuffered::create(GetOutputDevice(), true);
+ mxOverlayManager = ::sdr::overlay::OverlayManagerBuffered::create(GetOutputDevice(), GetPaintView().GetModel(), true);
}
else
{
@@ -217,7 +217,7 @@ void SdrPaintWindow::impCreateOverlayManager()
// take place
// Also hand over the old OverlayManager if existent; this means to take over
// the registered OverlayObjects from it
- mxOverlayManager = ::sdr::overlay::OverlayManager::create(GetOutputDevice());
+ mxOverlayManager = ::sdr::overlay::OverlayManager::create(GetOutputDevice(), GetPaintView().GetModel());
}
OSL_ENSURE(mxOverlayManager.is(), "SdrPaintWindow::SdrPaintWindow: Could not allocate an overlayManager (!)");
commit 619f033d3939839c0b3312e4d6bc1d3944b4ae3d
Author: Siqi Liu <me at siqi.fr>
Date: Fri Mar 6 13:35:34 2015 +0100
tdf#89705: provides callback for url handling on android.
Change-Id: Ie28cd768519fbdc305f98e1d764d05bd209951ca
diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index 8c20f70..56d92b0 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -40,6 +40,8 @@ public class Document {
public static final int CALLBACK_TEXT_SELECTION_START = 3;
public static final int CALLBACK_TEXT_SELECTION_END = 4;
public static final int CALLBACK_CURSOR_VISIBLE = 5;
+ // LOK_CALLBACK_GRAPHIC_SELECTION = 6
+ public static final int CALLBACK_HYPERLINK_CLICKED = 7;
/**
* Text selection types
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index 0ef12c6..179c6ff 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -5,6 +5,8 @@ import android.graphics.PointF;
import android.graphics.RectF;
import android.util.Log;
import android.view.KeyEvent;
+import android.net.Uri;
+import android.content.Intent;
import org.libreoffice.kit.DirectBufferAllocator;
import org.libreoffice.kit.Document;
@@ -411,10 +413,24 @@ public class LOKitTileProvider implements TileProvider, Document.MessageCallback
*/
@Override
public void messageRetrieved(int messageID, String payload) {
+ /**
+ * Handles messages that do not require entering editing mode.
+ */
+ switch (messageID) {
+ case Document.CALLBACK_HYPERLINK_CLICKED:
+ if (!payload.startsWith("http://") &&
+ !payload.startsWith("https://"))
+ payload = "http://" + payload;
+
+ Intent url_intent = new Intent(Intent.ACTION_VIEW);
+ url_intent.setData(Uri.parse(payload));
+ LibreOfficeMainActivity.mAppContext.startActivity(url_intent);
+ return;
+ }
+
if (!LOKitShell.isEditingEnabled()) {
return;
}
-
mInvalidationHandler.processMessage(messageID, payload);
}
}
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index cc5a32b..b8ab5f6 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -94,7 +94,13 @@ typedef enum
*
* Rectangle format is the same as LOK_CALLBACK_INVALIDATE_TILES.
*/
- LOK_CALLBACK_GRAPHIC_SELECTION
+ LOK_CALLBACK_GRAPHIC_SELECTION,
+
+ /**
+ * User clicked on an hyperlink that should be handled by other
+ * applications accordingly.
+ */
+ LOK_CALLBACK_HYPERLINK_CLICKED
}
LibreOfficeKitCallbackType;
commit 5aa19be38f9a176f82733643d47285e2c937cf00
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Mar 6 11:02:40 2015 +0100
sw: move LOK_CALLBACK_CURSOR_VISIBLE event from SwVisCrsr to SwCrsrShell
This should fix the problem that LOK_CALLBACK_CURSOR_VISIBLE is emitted
2 times during every mouse click (hide, then show), while the motivation
behind this callback is to just hide the blinking cursor for image
selection, i.e. it's never emitted during normal text editing.
Change-Id: Id2a2b1102589f8151f640af3fcb50b646d261275
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 1cb3da4..cc5a32b 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -83,9 +83,9 @@ typedef enum
/**
* The blinking text cursor is now visible or not.
*
- * Clients should assume that this is false initially and are expected to
- * show a blinking cursor at the rectangle described by
- * LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR once it becomes true. Payload is
+ * Clients should assume that this is true initially and are expected to
+ * hide the blinking cursor at the rectangle described by
+ * LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR once it becomes false. Payload is
* either the "true" or the "false" string.
*/
LOK_CALLBACK_CURSOR_VISIBLE,
diff --git a/libreofficekit/source/gtk/lokdocview.c b/libreofficekit/source/gtk/lokdocview.c
index 03b4d13..cbffc24 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -247,7 +247,7 @@ static void lok_docview_init( LOKDocView* pDocView )
pDocView->m_bEdit = FALSE;
memset(&pDocView->m_aVisibleCursor, 0, sizeof(pDocView->m_aVisibleCursor));
pDocView->m_bCursorOverlayVisible = FALSE;
- pDocView->m_bCursorVisible = FALSE;
+ pDocView->m_bCursorVisible = TRUE;
pDocView->m_nLastButtonPressTime = 0;
pDocView->m_nLastButtonReleaseTime = 0;
pDocView->m_pTextSelectionRectangles = NULL;
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 982a2ac..ef020fd 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -62,6 +62,7 @@
#include <globals.hrc>
#include <comcore.hrc>
#include <IDocumentLayoutAccess.hxx>
+#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#if defined(IOS)
#include <touch/touch.h>
@@ -2119,10 +2120,10 @@ void SwCrsrShell::ShowCrsr()
{
m_bSVCrsrVis = true;
m_pCurCrsr->SetShowTxtInputFldOverlay( true );
-#if defined(IOS)
- // This was dummied out both for Android and for TiledLibreOffice (iOS) anyway
- // touch_ui_show_keyboard();
-#endif
+
+ if (isTiledRendering())
+ libreOfficeKitCallback(LOK_CALLBACK_CURSOR_VISIBLE, OString::boolean(true).getStr());
+
UpdateCrsr();
}
}
@@ -2136,10 +2137,9 @@ void SwCrsrShell::HideCrsr()
SET_CURR_SHELL( this );
m_pCurCrsr->SetShowTxtInputFldOverlay( false );
m_pVisCrsr->Hide();
-#if defined(IOS)
- // This was dummied out both for Android and for TiledLibreOffice (iOS) anyway
- // touch_ui_hide_keyboard();
-#endif
+
+ if (isTiledRendering())
+ libreOfficeKitCallback(LOK_CALLBACK_CURSOR_VISIBLE, OString::boolean(false).getStr());
}
}
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 5a30a828..cbb55e8 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -93,16 +93,10 @@ void SwVisCrsr::Show()
if( m_pCrsrShell->VisArea().IsOver( m_pCrsrShell->m_aCharRect ) || m_pCrsrShell->isTiledRendering() )
_SetPosAndShow();
}
-
- if (m_pCrsrShell->isTiledRendering())
- m_pCrsrShell->libreOfficeKitCallback(LOK_CALLBACK_CURSOR_VISIBLE, OString::boolean(true).getStr());
}
void SwVisCrsr::Hide()
{
- if (m_pCrsrShell->isTiledRendering())
- m_pCrsrShell->libreOfficeKitCallback(LOK_CALLBACK_CURSOR_VISIBLE, OString::boolean(false).getStr());
-
if( m_bIsVisible )
{
m_bIsVisible = false;
commit 722e76350a572dc2933a4932a5b61e39c2d0cc76
Author: Siqi Liu <me at siqi.fr>
Date: Fri Mar 6 11:48:03 2015 +0100
add missing Activity import
Change-Id: I892b66265b411ea6f727bdacf41b45de055b2a37
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 0634c1d..2f2eada 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -1,5 +1,6 @@
package org.libreoffice;
+import android.app.Activity;
import android.app.AlertDialog;
import android.content.ContentResolver;
import android.content.Context;
commit 053e1d9935bd177e86d73d40ccfddef142d1f889
Author: Siqi Liu <me at siqi.fr>
Date: Fri Mar 6 11:47:21 2015 +0100
reapply changes to LayerView
Change-Id: I597621a0a68cf484d5117a5f5b77c3d122b14822
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
index 3f0fb78..88d93ca 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
@@ -28,6 +28,7 @@ import android.widget.FrameLayout;
import org.libreoffice.LibreOfficeMainActivity;
import org.libreoffice.R;
import org.mozilla.gecko.OnInterceptTouchListener;
+import org.mozilla.gecko.OnSlideSwipeListener;
/**
* A view rendered by the layer compositor.
@@ -110,6 +111,7 @@ public class LayerView extends FrameLayout {
setFocusableInTouchMode(true);
createGLThread();
+ setOnTouchListener(new OnSlideSwipeListener(getContext(), mLayerClient));
}
public void show() {
commit 64620fe20c69987e59fa4d7b85d8c69c38e2b8fe
Author: Siqi Liu <me at siqi.fr>
Date: Fri Mar 6 11:39:43 2015 +0100
revert changes on LayerView
Change-Id: I724a5bbc3dcb3372a3bf3810306658f4427b95a0
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
index c5b24fd..3f0fb78 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
@@ -28,7 +28,6 @@ import android.widget.FrameLayout;
import org.libreoffice.LibreOfficeMainActivity;
import org.libreoffice.R;
import org.mozilla.gecko.OnInterceptTouchListener;
-import org.mozilla.gecko.OnSlideSwipeListener;
/**
* A view rendered by the layer compositor.
@@ -111,349 +110,347 @@ public class LayerView extends FrameLayout {
setFocusableInTouchMode(true);
createGLThread();
-
- setOnTouchListener(new OnSlideSwipeListener(getContext(), mLayerClient));
}
public void show() {
- // Fix this if TextureView support is turned back on above
- mSurfaceView.setVisibility(View.VISIBLE);
+ // Fix this if TextureView support is turned back on above
+ mSurfaceView.setVisibility(View.VISIBLE);
}
public void hide() {
- // Fix this if TextureView support is turned back on above
- mSurfaceView.setVisibility(View.INVISIBLE);
+ // Fix this if TextureView support is turned back on above
+ mSurfaceView.setVisibility(View.INVISIBLE);
}
public void destroy() {
- if (mLayerClient != null) {
- mLayerClient.destroy();
- }
- if (mRenderer != null) {
- mRenderer.destroy();
- }
+ if (mLayerClient != null) {
+ mLayerClient.destroy();
+ }
+ if (mRenderer != null) {
+ mRenderer.destroy();
+ }
}
public void setTouchIntercepter(final OnInterceptTouchListener touchIntercepter) {
- // this gets run on the gecko thread, but for thread safety we want the assignment
- // on the UI thread.
- post(new Runnable() {
- public void run() {
- mTouchIntercepter = touchIntercepter;
- }
- });
+ // this gets run on the gecko thread, but for thread safety we want the assignment
+ // on the UI thread.
+ post(new Runnable() {
+ public void run() {
+ mTouchIntercepter = touchIntercepter;
+ }
+ });
}
public void setInputConnectionHandler(InputConnectionHandler inputConnectionHandler) {
- mInputConnectionHandler = inputConnectionHandler;
+ mInputConnectionHandler = inputConnectionHandler;
}
@Override
public boolean onTouchEvent(MotionEvent event) {
- if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
- requestFocus();
- }
+ if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
+ requestFocus();
+ }
- if (mTouchIntercepter != null && mTouchIntercepter.onInterceptTouchEvent(this, event)) {
- return true;
- }
- if (mPanZoomController != null && mPanZoomController.onTouchEvent(event)) {
- return true;
- }
- if (mTouchIntercepter != null && mTouchIntercepter.onTouch(this, event)) {
- return true;
- }
- return false;
+ if (mTouchIntercepter != null && mTouchIntercepter.onInterceptTouchEvent(this, event)) {
+ return true;
+ }
+ if (mPanZoomController != null && mPanZoomController.onTouchEvent(event)) {
+ return true;
+ }
+ if (mTouchIntercepter != null && mTouchIntercepter.onTouch(this, event)) {
+ return true;
+ }
+ return false;
}
@Override
public boolean onHoverEvent(MotionEvent event) {
- if (mTouchIntercepter != null && mTouchIntercepter.onTouch(this, event)) {
- return true;
- }
- return false;
+ if (mTouchIntercepter != null && mTouchIntercepter.onTouch(this, event)) {
+ return true;
+ }
+ return false;
}
@Override
public boolean onGenericMotionEvent(MotionEvent event) {
- if (mPanZoomController != null && mPanZoomController.onMotionEvent(event)) {
- return true;
- }
- return false;
+ if (mPanZoomController != null && mPanZoomController.onMotionEvent(event)) {
+ return true;
+ }
+ return false;
}
public GeckoLayerClient getLayerClient() { return mLayerClient; }
public PanZoomController getPanZoomController() { return mPanZoomController; }
public void setViewportSize(IntSize size) {
- mLayerClient.setViewportSize(new FloatSize(size));
+ mLayerClient.setViewportSize(new FloatSize(size));
}
public ImmutableViewportMetrics getViewportMetrics() {
- return mLayerClient.getViewportMetrics();
+ return mLayerClient.getViewportMetrics();
}
@Override
public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
- if (mInputConnectionHandler != null)
- return mInputConnectionHandler.onCreateInputConnection(outAttrs);
- return null;
+ if (mInputConnectionHandler != null)
+ return mInputConnectionHandler.onCreateInputConnection(outAttrs);
+ return null;
}
@Override
public boolean onKeyPreIme(int keyCode, KeyEvent event) {
- if (mInputConnectionHandler != null)
- return mInputConnectionHandler.onKeyPreIme(keyCode, event);
- return false;
+ if (mInputConnectionHandler != null)
+ return mInputConnectionHandler.onKeyPreIme(keyCode, event);
+ return false;
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
- if (mInputConnectionHandler != null)
- return mInputConnectionHandler.onKeyDown(keyCode, event);
- return false;
+ if (mInputConnectionHandler != null)
+ return mInputConnectionHandler.onKeyDown(keyCode, event);
+ return false;
}
@Override
public boolean onKeyLongPress(int keyCode, KeyEvent event) {
- if (mInputConnectionHandler != null)
- return mInputConnectionHandler.onKeyLongPress(keyCode, event);
- return false;
+ if (mInputConnectionHandler != null)
+ return mInputConnectionHandler.onKeyLongPress(keyCode, event);
+ return false;
}
@Override
public boolean onKeyMultiple(int keyCode, int repeatCount, KeyEvent event) {
- if (mInputConnectionHandler != null)
- return mInputConnectionHandler.onKeyMultiple(keyCode, repeatCount, event);
- return false;
+ if (mInputConnectionHandler != null)
+ return mInputConnectionHandler.onKeyMultiple(keyCode, repeatCount, event);
+ return false;
}
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
- if (mInputConnectionHandler != null)
- return mInputConnectionHandler.onKeyUp(keyCode, event);
- return false;
+ if (mInputConnectionHandler != null)
+ return mInputConnectionHandler.onKeyUp(keyCode, event);
+ return false;
}
public boolean isIMEEnabled() {
- /*if (mInputConnectionHandler != null) {
- return mInputConnectionHandler.isIMEEnabled();
- }*/
- return false;
+ /*if (mInputConnectionHandler != null) {
+ return mInputConnectionHandler.isIMEEnabled();
+ }*/
+ return false;
}
public void requestRender() {
- if (mListener != null) {
- mListener.renderRequested();
- }
+ if (mListener != null) {
+ mListener.renderRequested();
+ }
}
public void addLayer(Layer layer) {
- mRenderer.addLayer(layer);
+ mRenderer.addLayer(layer);
}
public void removeLayer(Layer layer) {
- mRenderer.removeLayer(layer);
+ mRenderer.removeLayer(layer);
}
public int getMaxTextureSize() {
- return mRenderer.getMaxTextureSize();
+ return mRenderer.getMaxTextureSize();
}
public void setLayerRenderer(LayerRenderer renderer) {
- mRenderer = renderer;
+ mRenderer = renderer;
}
public LayerRenderer getLayerRenderer() {
- return mRenderer;
+ return mRenderer;
}
/* paintState must be a PAINT_xxx constant. The state will only be changed
* if paintState represents a state that occurs after the current state. */
public void setPaintState(int paintState) {
- if (paintState > mPaintState) {
- Log.d(LOGTAG, "LayerView paint state set to " + paintState);
- mPaintState = paintState;
- }
+ if (paintState > mPaintState) {
+ Log.d(LOGTAG, "LayerView paint state set to " + paintState);
+ mPaintState = paintState;
+ }
}
public int getPaintState() {
- return mPaintState;
+ return mPaintState;
}
public LayerRenderer getRenderer() {
- return mRenderer;
+ return mRenderer;
}
public void setListener(Listener listener) {
- mListener = listener;
+ mListener = listener;
}
Listener getListener() {
- return mListener;
+ return mListener;
}
public GLController getGLController() {
- return mGLController;
+ return mGLController;
}
public Bitmap getDrawable(String name) {
- Context context = getContext();
- Resources resources = context.getResources();
- String packageName = resources.getResourcePackageName(R.id.dummy_id_for_package_name_resolution);
- int resourceID = resources.getIdentifier(name, "drawable", packageName);
- BitmapFactory.Options options = new BitmapFactory.Options();
- options.inScaled = false;
- return BitmapFactory.decodeResource(context.getResources(), resourceID, options);
+ Context context = getContext();
+ Resources resources = context.getResources();
+ String packageName = resources.getResourcePackageName(R.id.dummy_id_for_package_name_resolution);
+ int resourceID = resources.getIdentifier(name, "drawable", packageName);
+ BitmapFactory.Options options = new BitmapFactory.Options();
+ options.inScaled = false;
+ return BitmapFactory.decodeResource(context.getResources(), resourceID, options);
}
Bitmap getBackgroundPattern() {
- return getDrawable("background");
+ return getDrawable("background");
}
Bitmap getShadowPattern() {
- return getDrawable("shadow");
+ return getDrawable("shadow");
}
private void onSizeChanged(int width, int height) {
- mGLController.surfaceChanged(width, height);
+ mGLController.surfaceChanged(width, height);
- mLayerClient.setViewportSize(new FloatSize(width, height));
+ mLayerClient.setViewportSize(new FloatSize(width, height));
- if (mListener != null) {
- mListener.surfaceChanged(width, height);
- }
+ if (mListener != null) {
+ mListener.surfaceChanged(width, height);
+ }
}
private void onDestroyed() {
- mGLController.surfaceDestroyed();
+ mGLController.surfaceDestroyed();
- if (mListener != null) {
- mListener.compositionPauseRequested();
- }
+ if (mListener != null) {
+ mListener.compositionPauseRequested();
+ }
}
public Object getNativeWindow() {
- if (mSurfaceView != null)
- return mSurfaceView.getHolder();
+ if (mSurfaceView != null)
+ return mSurfaceView.getHolder();
- return mTextureView.getSurfaceTexture();
+ return mTextureView.getSurfaceTexture();
}
/** This function is invoked by Gecko (compositor thread) via JNI; be careful when modifying signature. */
public static GLController registerCxxCompositor() {
- try {
- LayerView layerView = LibreOfficeMainActivity.mAppContext.getLayerClient().getView();
- layerView.mListener.compositorCreated();
- return layerView.getGLController();
- } catch (Exception e) {
- Log.e(LOGTAG, "Error registering compositor!", e);
- return null;
- }
+ try {
+ LayerView layerView = LibreOfficeMainActivity.mAppContext.getLayerClient().getView();
+ layerView.mListener.compositorCreated();
+ return layerView.getGLController();
+ } catch (Exception e) {
+ Log.e(LOGTAG, "Error registering compositor!", e);
+ return null;
+ }
}
public interface Listener {
- void compositorCreated();
- void renderRequested();
- void compositionPauseRequested();
- void compositionResumeRequested(int width, int height);
- void surfaceChanged(int width, int height);
+ void compositorCreated();
+ void renderRequested();
+ void compositionPauseRequested();
+ void compositionResumeRequested(int width, int height);
+ void surfaceChanged(int width, int height);
}
private class SurfaceListener implements SurfaceHolder.Callback {
- public void surfaceChanged(SurfaceHolder holder, int format, int width,
- int height) {
- onSizeChanged(width, height);
- }
+ public void surfaceChanged(SurfaceHolder holder, int format, int width,
+ int height) {
+ onSizeChanged(width, height);
+ }
- public void surfaceCreated(SurfaceHolder holder) {
- if (mRenderControllerThread != null) {
- mRenderControllerThread.surfaceCreated();
- }
+ public void surfaceCreated(SurfaceHolder holder) {
+ if (mRenderControllerThread != null) {
+ mRenderControllerThread.surfaceCreated();
}
+ }
- public void surfaceDestroyed(SurfaceHolder holder) {
- onDestroyed();
- }
+ public void surfaceDestroyed(SurfaceHolder holder) {
+ onDestroyed();
+ }
}
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
- super.onLayout(changed, left, top, right, bottom);
- if (changed) {
- setViewportSize(new IntSize(right - left, bottom - top));
- }
+ super.onLayout(changed, left, top, right, bottom);
+ if (changed) {
+ setViewportSize(new IntSize(right - left, bottom - top));
+ }
}
private class SurfaceTextureListener implements TextureView.SurfaceTextureListener {
- public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
- // We don't do this for surfaceCreated above because it is always followed by a surfaceChanged,
- // but that is not the case here.
- if (mRenderControllerThread != null) {
- mRenderControllerThread.surfaceCreated();
- }
- onSizeChanged(width, height);
+ public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
+ // We don't do this for surfaceCreated above because it is always followed by a surfaceChanged,
+ // but that is not the case here.
+ if (mRenderControllerThread != null) {
+ mRenderControllerThread.surfaceCreated();
}
+ onSizeChanged(width, height);
+ }
- public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
- onDestroyed();
- return true; // allow Android to call release() on the SurfaceTexture, we are done drawing to it
- }
+ public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+ onDestroyed();
+ return true; // allow Android to call release() on the SurfaceTexture, we are done drawing to it
+ }
- public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
- onSizeChanged(width, height);
- }
+ public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
+ onSizeChanged(width, height);
+ }
- public void onSurfaceTextureUpdated(SurfaceTexture surface) {
- }
+ public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+ }
}
private RenderControllerThread mRenderControllerThread;
public synchronized void createGLThread() {
- if (mRenderControllerThread != null) {
- throw new LayerViewException ("createGLThread() called with a GL thread already in place!");
- }
+ if (mRenderControllerThread != null) {
+ throw new LayerViewException ("createGLThread() called with a GL thread already in place!");
+ }
- Log.e(LOGTAG, "### Creating GL thread!");
- mRenderControllerThread = new RenderControllerThread(mGLController);
- mRenderControllerThread.start();
- setListener(mRenderControllerThread);
- notifyAll();
+ Log.e(LOGTAG, "### Creating GL thread!");
+ mRenderControllerThread = new RenderControllerThread(mGLController);
+ mRenderControllerThread.start();
+ setListener(mRenderControllerThread);
+ notifyAll();
}
public synchronized Thread destroyGLThread() {
- // Wait for the GL thread to be started.
- Log.e(LOGTAG, "### Waiting for GL thread to be created...");
- while (mRenderControllerThread == null) {
- try {
- wait();
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
+ // Wait for the GL thread to be started.
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list