svx/source/sidebar/effect/EffectPropertyPanel.cxx | 2 +- svx/uiconfig/ui/sidebareffect.ui | 4 ++-- vcl/jsdialog/jsdialogbuilder.cxx | 1 + 3 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit 0b538d1ca8893c0faff55e1e20e62f070fd411d6 Author: Szymon Kłos <szymon.k...@collabora.com> AuthorDate: Fri Jul 9 16:38:57 2021 +0200 Commit: Szymon Kłos <szymon.k...@collabora.com> CommitDate: Wed Aug 18 10:38:39 2021 +0200 jsdialog: dont use popular id for glow color to avoid confusing it on updates Change-Id: I2b19dc41a17e070ac1c8869d478c3b0b09a54223 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118692 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Szymon Kłos <szymon.k...@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120614 Tested-by: Szymon Kłos <szymon.k...@collabora.com> diff --git a/svx/source/sidebar/effect/EffectPropertyPanel.cxx b/svx/source/sidebar/effect/EffectPropertyPanel.cxx index 78424ccc2175..77e2dac11229 100644 --- a/svx/source/sidebar/effect/EffectPropertyPanel.cxx +++ b/svx/source/sidebar/effect/EffectPropertyPanel.cxx @@ -36,7 +36,7 @@ EffectPropertyPanel::EffectPropertyPanel(weld::Widget* pParent, SfxBindings* pBi m_xBuilder->weld_metric_spin_button("LB_GLOW_TRANSPARENCY", FieldUnit::PERCENT)) , mxFTRadiusSoftEdge(m_xBuilder->weld_label("radiussoftedge")) , mxFTRadiusGlow(m_xBuilder->weld_label("radiusglow")) - , mxFTColor(m_xBuilder->weld_label("color")) + , mxFTColor(m_xBuilder->weld_label("glowcolorlabel")) , mxSoftEdgeRadius(m_xBuilder->weld_metric_spin_button("SB_SOFTEDGE_RADIUS", FieldUnit::POINT)) { Initialize(); diff --git a/svx/uiconfig/ui/sidebareffect.ui b/svx/uiconfig/ui/sidebareffect.ui index 6a18fdcb5b7c..0c0ee28da606 100644 --- a/svx/uiconfig/ui/sidebareffect.ui +++ b/svx/uiconfig/ui/sidebareffect.ui @@ -73,7 +73,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="color"> + <object class="GtkLabel" id="glowcolorlabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes" context="sidebarglow|color">Color:</property> @@ -227,7 +227,7 @@ <object class="GtkSizeGroup" id="sizegroupLabel"> <widgets> <widget name="radiusglow"/> - <widget name="color"/> + <widget name="glowcolorlabel"/> <widget name="transparency"/> <widget name="radiussoftedge"/> </widgets> commit c2d32db5b1c401bf8412713a4416491337831f39 Author: Szymon Kłos <szymon.k...@collabora.com> AuthorDate: Wed Jul 7 12:19:12 2021 +0200 Commit: Szymon Kłos <szymon.k...@collabora.com> CommitDate: Wed Aug 18 10:38:28 2021 +0200 jsdialog: send type for popup messages Change-Id: Ic0f189645dc9a1164cbbc528b3a5d30d72ee3333 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118552 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Szymon Kłos <szymon.k...@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120613 Tested-by: Szymon Kłos <szymon.k...@collabora.com> diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index a376faed407d..6f63067b6186 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -251,6 +251,7 @@ JSDialogNotifyIdle::generateClosePopupMessage(OUString sWindowId) const return aJsonWriter; aJsonWriter->put("jsontype", "dialog"); + aJsonWriter->put("type", "modalpopup"); aJsonWriter->put("action", "close"); aJsonWriter->put("id", sWindowId);