sd/uiconfig/simpress/ui/customanimationspanel.ui | 78 ++++++++++++----------- vcl/source/treelist/iconview.cxx | 5 + 2 files changed, 46 insertions(+), 37 deletions(-)
New commits: commit 841d468fb664f60876f9da59c357eaac61aa0b6b Author: Szymon Kłos <[email protected]> AuthorDate: Mon Dec 22 05:39:31 2025 +0000 Commit: Andras Timar <[email protected]> CommitDate: Sat Jan 10 23:40:40 2026 +0100 sidebar: fix span values for Impress -> Animation deck - in grid we had single element which was in last column - span it inside box with the second column item - all other fields should occupy full width Change-Id: Ia7dd79798e436377b18ea0c2dfda1b7754780bd5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196059 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Darshan Upadhyay <[email protected]> Reviewed-by: Szymon Kłos <[email protected]> (cherry picked from commit b2118b0cc2730d214082b9882c138de4acaeef1f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196973 Reviewed-by: Andras Timar <[email protected]> Tested-by: Jenkins diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui b/sd/uiconfig/simpress/ui/customanimationspanel.ui index a9ae9154b9da..7c6578232ff9 100644 --- a/sd/uiconfig/simpress/ui/customanimationspanel.ui +++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui @@ -315,9 +315,9 @@ </child> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">0</property> <property name="top-attach">1</property> - <property name="width">2</property> + <property name="width">3</property> </packing> </child> <child> @@ -473,6 +473,7 @@ <packing> <property name="left-attach">1</property> <property name="top-attach">5</property> + <property name="width">2</property> </packing> </child> <child> @@ -488,25 +489,6 @@ <property name="top-attach">6</property> </packing> </child> - <child> - <object class="GtkButton" id="more_properties"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes" context="customanimationspanel|more_properties|tooltip_text">Options</property> - <property name="image">image1</property> - <property name="always-show-image">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="more_properties-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="customanimationspanel|extended_tip|more_properties">Specifies additional properties for the selected element in the Custom Animations pane.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">6</property> - </packing> - </child> <child> <object class="GtkLabel" id="effect_duration"> <property name="visible">True</property> @@ -537,6 +519,7 @@ <packing> <property name="left-attach">1</property> <property name="top-attach">7</property> + <property name="width">2</property> </packing> </child> <child> @@ -569,6 +552,7 @@ <packing> <property name="left-attach">1</property> <property name="top-attach">8</property> + <property name="width">2</property> </packing> </child> <child> @@ -650,32 +634,52 @@ </packing> </child> <child> - <object class="GtkBox" id="placeholder"> + <object class="GtkBox" id="dirspan"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="spacing">6</property> <child> - <placeholder/> + <object class="GtkBox" id="placeholder"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="hexpand">True</property> + <property name="spacing">6</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="more_properties"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="customanimationspanel|more_properties|tooltip_text">Options</property> + <property name="image">image1</property> + <property name="always-show-image">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="more_properties-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="customanimationspanel|extended_tip|more_properties">Specifies additional properties for the selected element in the Custom Animations pane.</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> <property name="left-attach">1</property> <property name="top-attach">6</property> + <property name="width">2</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> </child> </object> commit e54fba1ef1a6ebe9e5d9df01e36850ad16178e11 Author: Maya Stephens <[email protected]> AuthorDate: Fri Dec 19 15:23:04 2025 +0000 Commit: Andras Timar <[email protected]> CommitDate: Sat Jan 10 23:40:30 2026 +0100 Add size info to icons with ondemand rendering For icons with on demand rendering, send the image width and height to make the placeholder image the correct size. Change-Id: Ib47e297dca830c153c0c1ac0e130d2c26a6a6964 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196571 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit d2e9d411f54a4fc300f9fbf43daed4175776acce) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196970 Tested-by: Jenkins Reviewed-by: Andras Timar <[email protected]> diff --git a/vcl/source/treelist/iconview.cxx b/vcl/source/treelist/iconview.cxx index 2eb254eb2fe0..3e65cf847a0b 100644 --- a/vcl/source/treelist/iconview.cxx +++ b/vcl/source/treelist/iconview.cxx @@ -327,8 +327,13 @@ void IconView::DumpEntryAndSiblings(tools::JsonWriter& rJsonWriter, SvTreeListEn if (pIt) { const SvLBoxContextBmp* pBmpItem = static_cast<const SvLBoxContextBmp*>(pIt); + Size i = pBmpItem->GetBitmap1().GetSizePixel(); if (pBmpItem) + { rJsonWriter.put("ondemand", true); + rJsonWriter.put("width", i.getWidth()); + rJsonWriter.put("height", i.getHeight()); + } } if (const OUString tooltip = GetEntryTooltip(pEntry); !tooltip.isEmpty())
