[Libreoffice-commits] core.git: editeng/source include/vcl vcl/source

[Tamás Zolnai]

 editeng/source/editeng/impedit2.cxx |    4 +++-
 include/vcl/event.hxx               |    3 ++-
 vcl/source/window/keyevent.cxx      |   10 ++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 8c46185bf28f61e674186694e4944c1f8b3a9c00
Author: Tamás Zolnai <tamas.zol...@collabora.com>
Date:   Sun Apr 23 14:55:52 2017 +0200

    Handle keyinput properly in case of BottomToTop vertical text
    
    Change-Id: I2b0f7cee9a4a7d7ad154c705f84a8b995b4f23a1
    Reviewed-on: https://gerrit.libreoffice.org/36830
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com>

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index 5103333281f8..9e4072636e9a 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -756,8 +756,10 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& 
rKeyEvent, EditView* pE
     EditPaM aOldPaM( aPaM );
 
     TextDirectionality eTextDirection = 
TextDirectionality::LeftToRight_TopToBottom;
-    if ( IsVertical() )
+    if (IsVertical() && IsTopToBottom())
         eTextDirection = TextDirectionality::TopToBottom_RightToLeft;
+    else if (IsVertical() && !IsTopToBottom())
+        eTextDirection = TextDirectionality::BottomToTop_LeftToRight;
     else if ( IsRightToLeft( GetEditDoc().GetPos( aPaM.GetNode() ) ) )
         eTextDirection = TextDirectionality::RightToLeft_TopToBottom;
 
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx
index 7c58ac620c01..26ce846ed9f4 100644
--- a/include/vcl/event.hxx
+++ b/include/vcl/event.hxx
@@ -41,7 +41,8 @@ namespace com { namespace sun { namespace star { namespace 
awt {
 enum class TextDirectionality {
     LeftToRight_TopToBottom,
     RightToLeft_TopToBottom,
-    TopToBottom_RightToLeft
+    TopToBottom_RightToLeft,
+    BottomToTop_LeftToRight
 };
 
 class VCL_DLLPUBLIC KeyEvent
diff --git a/vcl/source/window/keyevent.cxx b/vcl/source/window/keyevent.cxx
index d644bc3d19c9..f5a7c5b1abe8 100644
--- a/vcl/source/window/keyevent.cxx
+++ b/vcl/source/window/keyevent.cxx
@@ -55,6 +55,16 @@ KeyEvent KeyEvent::LogicalTextDirectionality 
(TextDirectionality eMode) const
             }
             break;
 
+        case TextDirectionality::BottomToTop_LeftToRight:
+            switch (nCode)
+            {
+                case KEY_DOWN:  aClone.maKeyCode = vcl::KeyCode(KEY_LEFT, 
nMod); break;
+                case KEY_UP:    aClone.maKeyCode = vcl::KeyCode(KEY_RIGHT, 
nMod); break;
+                case KEY_LEFT:  aClone.maKeyCode = vcl::KeyCode(KEY_UP, nMod); 
break;
+                case KEY_RIGHT: aClone.maKeyCode = vcl::KeyCode(KEY_DOWN, 
nMod); break;
+            }
+            break;
+
         case TextDirectionality::LeftToRight_TopToBottom:
             /* do nothing */
             break;

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits