include/touch/touch.h | 7 +++++ ios/shared/ios_sharedlo/cxx/mlo_uno.mm | 2 - ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m | 2 - vcl/ios/iosinst.cxx | 13 ++++++++++ 4 files changed, 21 insertions(+), 3 deletions(-)
New commits: commit f2202fed9e9682a6316df0deb0f4679a0a3184e2 Author: Jan Holesovsky <ke...@collabora.com> Date: Thu Oct 17 11:10:34 2013 +0200 Tiles: Documentation of the parameters. Change-Id: Ibe31a105972cee2aff9b6896cdd80bd93a1a0e7d diff --git a/include/touch/touch.h b/include/touch/touch.h index 892e3b2..c8af48e 100644 --- a/include/touch/touch.h +++ b/include/touch/touch.h @@ -58,7 +58,12 @@ void touch_lo_pan(int deltaX, int deltaY); void touch_lo_zoom(int x, int y, float scale); void touch_lo_keyboard_input(int c); -void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, int tileWidth, int tileHeight, int tilePosX, int tilePosY); +/** Draw part of the document. + +tilePosX, tilePosY, tileWidth, tileHeight address the part of the document to be drawn. +context, contextHeight, contextWidth specify where to draw. +*/ +void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, int tilePosX, int tilePosY, int tileWidth, int tileHeight); typedef enum { DOWN, MOVE, UP} MLOMouseButtonState; diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx index 8adc26a..b4e7257 100644 --- a/vcl/ios/iosinst.cxx +++ b/vcl/ios/iosinst.cxx @@ -504,7 +504,7 @@ void touch_lo_keyboard_did_hide() } extern "C" -void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, int tileWidth, int tileHeight, int tilePosX, int tilePosY) +void touch_lo_draw_tile(void * /*context*/, int /*contextWidth*/, int /*contextHeight*/, int /*tilePosX*/, int /*tilePosY*/, int /*tileWidth*/, int /*tileHeight*/) { // draws the area of one tile commit d8e8e6bcbeaa9c4d0058e01ce7be07e57f615b1d Author: p...@cloudon.com <p...@cloudon.com> Date: Wed Oct 16 16:02:44 2013 +0200 added draw tile signature and select all fix Change-Id: I6118c55caa12d9ba52000f89e869e27b218859be diff --git a/include/touch/touch.h b/include/touch/touch.h index 1d93e65..892e3b2 100644 --- a/include/touch/touch.h +++ b/include/touch/touch.h @@ -58,6 +58,8 @@ void touch_lo_pan(int deltaX, int deltaY); void touch_lo_zoom(int x, int y, float scale); void touch_lo_keyboard_input(int c); +void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, int tileWidth, int tileHeight, int tilePosX, int tilePosY); + typedef enum { DOWN, MOVE, UP} MLOMouseButtonState; void touch_lo_mouse_drag(int x, int y, MLOMouseButtonState state); diff --git a/ios/shared/ios_sharedlo/cxx/mlo_uno.mm b/ios/shared/ios_sharedlo/cxx/mlo_uno.mm index f75fe1a..ff92821 100644 --- a/ios/shared/ios_sharedlo/cxx/mlo_uno.mm +++ b/ios/shared/ios_sharedlo/cxx/mlo_uno.mm @@ -471,7 +471,7 @@ mlo_is_document_open(void){ extern "C" void -lmo_select_all(void){ +mlo_select_all(void){ getXDispatchHelper()->executeDispatch(getXDispatchProvider(), OUString(".uno:SelectAll"), OUString("_self"), diff --git a/ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m b/ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m index c9a75c4..79ccd4d 100644 --- a/ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m +++ b/ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m @@ -33,11 +33,9 @@ -(void)loSelectAll:(id) sender{ -#if 0 // No mlo_select_all() anywhere !? NSLog(@"Calling mlo_select_all()"); mlo_select_all(); NSLog(@"mlo_select_all() returned. reshowing contextualMenu"); -#endif [_selectionViewController showPostSelectAll]; } diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx index 353abe4..8adc26a 100644 --- a/vcl/ios/iosinst.cxx +++ b/vcl/ios/iosinst.cxx @@ -503,4 +503,17 @@ void touch_lo_keyboard_did_hide() } } +extern "C" +void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, int tileWidth, int tileHeight, int tilePosX, int tilePosY) +{ + // draws the area of one tile + + SalFrame *pFocus = IosSalInstance::getInstance()->getFocusFrame(); + if (pFocus) { + + // TODO: calling tile drawing code + + } +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits