[Libreoffice-commits] core.git: 2 commits - vcl/jsdialog vcl/source

[Szymon KÅ‚os (via logerrit)]

 vcl/jsdialog/executor.cxx    |    2 ++
 vcl/source/window/dialog.cxx |    5 +++++
 2 files changed, 7 insertions(+)

New commits:
commit 4c6ee7ed3d97c3a36b071336a910159fae7820e3
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Dec 8 11:21:34 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon Dec 28 10:51:10 2020 +0100

    jsdialog: dump collapsed state for dialog
    
    Change-Id: I69b154b3fd2819c68194eaee9ed785e00dc386f5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107401
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108393
    Tested-by: Jenkins

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index c3899483b0a4..25d1f146f6b4 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1643,6 +1643,11 @@ void Dialog::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
 {
     SystemWindow::DumpAsPropertyTree(rJsonWriter);
     rJsonWriter.put("title", GetText());
+    if (vcl::Window* pActionArea = get_action_area())
+    {
+        if (!pActionArea->IsVisible())
+            rJsonWriter.put("collapsed", "true");
+    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 69c72c6069bc297ae00c71bcc3164ce609f44c32
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Dec 7 09:49:01 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon Dec 28 10:50:52 2020 +0100

    jsdialog: change selection not merge
    
    Change-Id: Ie76320aef21ca2c94be608ec06726ac0af6a66f4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107335
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108392
    Tested-by: Jenkins

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 0ff259e7bfd4..775879c54f69 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -204,7 +204,9 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& rWidget, StringMap& rDat
                         = OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US);
                     int nRow = std::atoi(nRowString.getStr());
 
+                    pTreeView->unselect(pTreeView->get_selected_index());
                     pTreeView->select(nRow);
+                    pTreeView->set_cursor(nRow);
                     LOKTrigger::trigger_changed(*pTreeView);
                     LOKTrigger::trigger_row_activated(*pTreeView);
                     return true;