sfx2/source/dialog/StyleList.cxx | 2 +-
sfx2/uiconfig/ui/templatepanel.ui | 14 ++++++++++----
vcl/source/app/salvtables.cxx | 2 +-
3 files changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 186a2738396e938cc898166b95a02c70a5e22a30
Author: Jim Raykowski <rayk...@gmail.com>
AuthorDate: Fri Mar 21 13:30:17 2025 -0800
Commit: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Sat Mar 22 08:40:07 2025 +0100
Resolves: tdf#165756 - The spotlight view does not display colored and
numbered boxes beside the names of the styles (GTK3)
This first went missing when the surface attributes were dropped in
commit e3d7473a5611f414bfcf1a3e812248c82f9e9b83 and then again in commit
7f42f031ed1b9f374f3fcba9c814dc5862492026 when set_image replaced setting
the image in insert.
Change-Id: Ib5dd05e11fbc3db8f02a777cf7147bfd2b01ae97
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183213
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
diff --git a/sfx2/source/dialog/StyleList.cxx b/sfx2/source/dialog/StyleList.cxx
index a51a9e0e0a0d..b925b7e6e6a9 100644
--- a/sfx2/source/dialog/StyleList.cxx
+++ b/sfx2/source/dialog/StyleList.cxx
@@ -760,7 +760,7 @@ static void lcl_Update(weld::TreeView& rTreeView, const
weld::TreeIter& rIter,
rTreeView.set_id(rIter, rName);
rTreeView.set_text(rIter, rName);
- rTreeView.set_image(rIter, *xDevice);
+ rTreeView.set_image(rIter, *xDevice, 0);
}
static void FillBox_Impl(weld::TreeView& rBox, StyleTreeArr_Impl& rTreeArray,
diff --git a/sfx2/uiconfig/ui/templatepanel.ui
b/sfx2/uiconfig/ui/templatepanel.ui
index 41c908c805cd..a5d232659113 100644
--- a/sfx2/uiconfig/ui/templatepanel.ui
+++ b/sfx2/uiconfig/ui/templatepanel.ui
@@ -4,8 +4,8 @@
<requires lib="gtk+" version="3.20"/>
<object class="GtkTreeStore" id="liststore1">
<columns>
- <!-- column-name image -->
- <column type="CairoSurface"/>
+ <!-- column-name pixbuf -->
+ <column type="GdkPixbuf"/>
<!-- column-name text -->
<column type="gchararray"/>
<!-- column-name id -->
@@ -14,8 +14,8 @@
</object>
<object class="GtkTreeStore" id="liststore2">
<columns>
- <!-- column-name image -->
- <column type="CairoSurface"/>
+ <!-- column-name pixbuf -->
+ <column type="GdkPixbuf"/>
<!-- column-name text -->
<column type="gchararray"/>
<!-- column-name id -->
@@ -304,6 +304,9 @@
<object class="GtkTreeViewColumn" id="treeviewcolumn0">
<child>
<object class="GtkCellRendererPixbuf"
id="cellrendererpixbuf1"/>
+ <attributes>
+ <attribute name="pixbuf">0</attribute>
+ </attributes>
</child>
</object>
</child>
@@ -358,6 +361,9 @@
<object class="GtkTreeViewColumn" id="treeviewcolumn3">
<child>
<object class="GtkCellRendererPixbuf"
id="cellrendererpixbuf2"/>
+ <attributes>
+ <attribute name="pixbuf">0</attribute>
+ </attributes>
</child>
</object>
</child>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 4cc7090697bc..3dc6c0f38bb5 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -4533,7 +4533,7 @@ void SalInstanceTreeView::end_editing() {
m_xTreeView->EndEditing(); }
void SalInstanceTreeView::set_image(SvTreeListEntry* pEntry, const Image&
rImage, int col)
{
- if (col == -1)
+ if (col == -1 || col == 0)
{
m_xTreeView->SetExpandedEntryBmp(pEntry, rImage);
m_xTreeView->SetCollapsedEntryBmp(pEntry, rImage);
