[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 2 commits - vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 9d44086770d9a1c625d42676033f47a698dfa572
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Mon Oct 23 15:26:28 2023 +0200
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Oct 24 10:35:51 2023 +0200

    jsdialog: don't send  update in toolbox when not modified
    
    Change-Id: I74087b54f9844ea5d22de03caf8724d38d525646
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158356
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Gökay ŞATIR <gokaysa...@collabora.com>

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index a15d85ae49c0..3cdf403c6242 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1982,8 +1982,10 @@ void JSToolbar::set_menu_item_active(const OString& 
rIdent, bool bActive)
 
 void JSToolbar::set_item_sensitive(const OString& rIdent, bool bSensitive)
 {
+    bool bWasSensitive = get_item_sensitive(rIdent);
     SalInstanceToolbar::set_item_sensitive(rIdent, bSensitive);
-    sendUpdate();
+    if (bWasSensitive != bSensitive)
+        sendUpdate();
 }
 
 void JSToolbar::set_item_icon_name(const OString& rIdent, const OUString& 
rIconName)
commit 9e2da48ec3dbe541ff52f6d69f98afb57afaac3e
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Mon Oct 23 12:49:36 2023 +0200
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Oct 24 10:35:45 2023 +0200

    jsdialog: send smaller messages for combobox
    
    Signed-off-by: Szymon Kłos <szymon.k...@collabora.com>
    Change-Id: Ib514607ad56b965c33439ad548ec90d516acfcf0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158345
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Gökay ŞATIR <gokaysa...@collabora.com>

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 2f38b03c093e..a15d85ae49c0 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1661,7 +1661,11 @@ void JSComboBox::set_entry_text_without_notify(const 
OUString& rText)
 void JSComboBox::set_entry_text(const OUString& rText)
 {
     SalInstanceComboBoxWithEdit::set_entry_text(rText);
-    sendUpdate();
+
+    std::unique_ptr<jsdialog::ActionDataMap> pMap = 
std::make_unique<jsdialog::ActionDataMap>();
+    (*pMap)[ACTION_TYPE] = "setText";
+    (*pMap)["text"] = rText;
+    sendAction(std::move(pMap));
 }
 
 void JSComboBox::set_active(int pos)
@@ -1670,7 +1674,11 @@ void JSComboBox::set_active(int pos)
         return;
 
     SalInstanceComboBoxWithEdit::set_active(pos);
-    sendUpdate();
+
+    std::unique_ptr<jsdialog::ActionDataMap> pMap = 
std::make_unique<jsdialog::ActionDataMap>();
+    (*pMap)[ACTION_TYPE] = "select";
+    (*pMap)["position"] = OUString::number(pos);
+    sendAction(std::move(pMap));
 }
 
 void JSComboBox::set_active_id(const OUString& rStr)