commit da9a539999fc8ae47a78542ce646005f3a9be868
author Caolán McNamara <caolanm@redhat.com> Wed Sep 19 15:35:36 2018 +0100
committer Caolán McNamara <caolanm@redhat.com> Thu Sep 20 09:56:15 2018 +0200
tree 955f1361b5379da8bf24ab23e4cabdc3dc260745
parent 3f73733f7df6393be773e66e445eb0a86e9a9377

use can-focus for TB_TABSTOP|WB_NOTABSTOP, not editable

Change-Id: I56e60b98151c5dfcf8148ddafb6224bed734d039
Reviewed-on: https://gerrit.libreoffice.org/60773
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

vcl/source/control/edit.cxx

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index b40b3df..3688f9c 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -191,16 +191,7 @@ bool Edit::set_property(const OString &rKey, const OUString &rValue)
    }
    else if (rKey == "editable")
    {
        bool bReadOnly = !toBool(rValue);
        SetReadOnly(bReadOnly);
        //disable tab to traverse into readonly editables
        WinBits nBits = GetStyle();
        nBits &= ~(WB_TABSTOP|WB_NOTABSTOP);
        if (!bReadOnly)
            nBits |= WB_TABSTOP;
        else
            nBits |= WB_NOTABSTOP;
        SetStyle(nBits);
        SetReadOnly(!toBool(rValue));
    }
    else if (rKey == "visibility")
    {

vcl/source/window/window2.cxx

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 829f7e3..bce47fc 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1553,9 +1553,11 @@ bool Window::set_property(const OString &rKey, const OUString &rValue)
    else if (rKey == "can-focus")
    {
        WinBits nBits = GetStyle();
        nBits &= ~WB_TABSTOP;
        nBits &= ~(WB_TABSTOP|WB_NOTABSTOP);
        if (toBool(rValue))
            nBits |= WB_TABSTOP;
        else
            nBits |= WB_NOTABSTOP;
        SetStyle(nBits);
    }
    else