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

[Henry Castro (via logerrit)]

 include/vcl/toolkit/dialog.hxx |    1 +
 vcl/source/window/dialog.cxx   |    8 ++++++++
 2 files changed, 9 insertions(+)

New commits:
commit c266dae3fbea14cdd29e590d9ec8f519813143b3
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Fri Dec 4 15:38:35 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Fri Dec 18 16:27:46 2020 +0100

    lok: jsbuilder: fix disable dialog tunneling
    
    When a client side issue command to show the Macro Selector Dialog
    to the server side, it is not necessary the dialog sends window
    invalidate.
    
    I guess the dialog tunneling progressively will be deprecated in
    favor of JSDialog, that it will send JSON data to client side,
    then it will be constructed to html element using a javascript
    dialog builder. (I am wondering why sending JSON?, the server side
    can just send the HTML string, and no need for javascript dialog builder).
    
    Change-Id: Ia88f431ed9a860bb9bb30caaaf0f7f889d765115
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107240
    Tested-by: Jenkins
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/include/vcl/toolkit/dialog.hxx b/include/vcl/toolkit/dialog.hxx
index 922bb8e46164..cbda9ee4b6fc 100644
--- a/include/vcl/toolkit/dialog.hxx
+++ b/include/vcl/toolkit/dialog.hxx
@@ -109,6 +109,7 @@ public:
     virtual void    StateChanged( StateChangedType nStateChange ) override;
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
     virtual void    Command( const CommandEvent& rCEvt ) override;
+    virtual void    PixelInvalidate(const tools::Rectangle* pRectangle) override;
 
     virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override;
     virtual bool set_property(const OString &rKey, const OUString &rValue) override;
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index cf240167d588..c3899483b0a4 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -396,6 +396,14 @@ void Dialog::ImplInitDialogData()
     mpDialogImpl.reset(new DialogImpl);
 }
 
+void Dialog::PixelInvalidate(const tools::Rectangle* pRectangle)
+{
+    if (!mpDialogImpl->m_bLOKTunneling)
+        return;
+
+    Window::PixelInvalidate(pRectangle);
+}
+
 vcl::Window* Dialog::GetDefaultParent(WinBits nStyle)
 {
     vcl::Window* pParent = Application::GetDefDialogParent();