diff options
| author | ptyl@cloudon.com <ptyl@cloudon.com> | 2013-10-16 16:02:44 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2013-10-17 11:11:39 +0200 |
| commit | d8e8e6bcbeaa9c4d0058e01ce7be07e57f615b1d (patch) | |
| tree | 155fd020361e6e51ebe1bf6ff80b9334f562257f | |
| parent | fcdde111e451f84e373c67a485c87d1ad744cfe4 (diff) | |
added draw tile signature and select all fix
Change-Id: I6118c55caa12d9ba52000f89e869e27b218859be
| -rw-r--r-- | include/touch/touch.h | 2 | ||||
| -rw-r--r-- | ios/shared/ios_sharedlo/cxx/mlo_uno.mm | 2 | ||||
| -rw-r--r-- | ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m | 2 | ||||
| -rw-r--r-- | vcl/ios/iosinst.cxx | 13 |
4 files changed, 16 insertions, 3 deletions
diff --git a/include/touch/touch.h b/include/touch/touch.h index 1d93e6572325..892e3b2c45ce 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 f75fe1a455bf..ff92821f0fff 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 c9a75c481de5..79ccd4d53566 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 353abe4662ef..8adc26a29cb0 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: */ |