[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 2 commits - desktop/inc

[Ashod Nakashian]

 desktop/inc/lib/init.hxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 856755c8a47fe67e4312abd85003b06451daaf5f
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sat Apr 23 14:06:22 2016 -0400

    Desktop compresses text selection start/end notifications
    
    Reviewed-on: https://gerrit.libreoffice.org/24320
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>
    (cherry picked from commit 45037438d84485356a5ceb820ecc3e0bae4b112e)
    Reviewed-on: https://gerrit.libreoffice.org/24380
    Tested-by: Jenkins <ci at libreoffice.org>
    (cherry picked from commit 3d27afd26f7b85c46a7c7d08498000b9dbcea1c8)
    
    Change-Id: Ia85ded04d0eaf9d9b846fab6d86a44a758fccb69

diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index 5a38667..a6f9396 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -39,6 +39,8 @@ namespace desktop {
 
             // Add the states that are safe to skip duplicates on,
             // even when not consequent.
+            m_states.emplace(LOK_CALLBACK_TEXT_SELECTION_START, "NIL");
+            m_states.emplace(LOK_CALLBACK_TEXT_SELECTION_END, "NIL");
             m_states.emplace(LOK_CALLBACK_TEXT_SELECTION, "NIL");
             m_states.emplace(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, "NIL");
             m_states.emplace(LOK_CALLBACK_STATE_CHANGED, "NIL");
@@ -94,6 +96,13 @@ namespace desktop {
                 return;
             }
 
+            if (type == LOK_CALLBACK_TEXT_SELECTION && payload.empty())
+            {
+                // Removing text selection invalidates the start and end as well.
+                m_states[LOK_CALLBACK_TEXT_SELECTION_START] = "";
+                m_states[LOK_CALLBACK_TEXT_SELECTION_END] = "";
+            }
+
             m_queue.emplace_back(type, payload);
 
             lock.unlock();
commit f5ddb310f1435450574346853d0e20b44f8a8dc3
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sat Apr 23 10:23:48 2016 -0400

    Desktop compresses mouse pointer notifications
    
    Reviewed-on: https://gerrit.libreoffice.org/24319
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>
    (cherry picked from commit 7c01cf652850a8b8d3fd5ef6eb0a12ca6e725943)
    Reviewed-on: https://gerrit.libreoffice.org/24379
    Tested-by: Jenkins <ci at libreoffice.org>
    (cherry picked from commit dc464bdb08cf6a3a3b118245b6eecbda5e94fb42)
    
    Change-Id: Id76f4e2952c4c551b626d094c11eb3339d76e50c

diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index 0f5943a..5a38667 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -42,6 +42,7 @@ namespace desktop {
             m_states.emplace(LOK_CALLBACK_TEXT_SELECTION, "NIL");
             m_states.emplace(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, "NIL");
             m_states.emplace(LOK_CALLBACK_STATE_CHANGED, "NIL");
+            m_states.emplace(LOK_CALLBACK_MOUSE_POINTER, "NIL");
 
             Start();
         }