cui/uiconfig/ui/borderpage.ui | 38 ++++++++++----------------------------
vcl/qt5/QtBuilder.cxx | 1 +
2 files changed, 11 insertions(+), 28 deletions(-)
New commits:
commit 14f097c460513861553ede38f1412b8621361992
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Aug 5 15:04:23 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Aug 7 10:18:51 2025 +0200
tdf#130857 qt weld: Don't allow moving items in IconView
By default, items in a QListView in IconMode can
be dragged and dropped anywhere, see [1].
This is unintended here, so disable it.
Otherwise, e.g. the icons in the "Insert" -> "Fontwork"
dialog can freely be moved around.
[1] https://doc.qt.io/qt-6/qlistview.html#viewMode-prop
Change-Id: If5689e3a1e5ab35f5090c9aca396c1c52881d82c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188963
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx
index eb2cb6ded0ba..6ee30a28d69e 100644
--- a/vcl/qt5/QtBuilder.cxx
+++ b/vcl/qt5/QtBuilder.cxx
@@ -260,6 +260,7 @@ QObject* QtBuilder::makeObject(QObject* pParent,
std::u16string_view sName, std:
QListView* pListView = new QListView(pParentWidget);
pListView->setModel(new QStandardItemModel(pListView));
pListView->setViewMode(QListView::IconMode);
+ pListView->setMovement(QListView::Static);
pObject = pListView;
}
else if (sName == u"GtkImage")
commit eaddd58550098fcf73b83507e1fee00eec205856
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Aug 5 14:23:16 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Aug 7 10:18:45 2025 +0200
tdf#167658 Drop IconView's scrolled window parents in "Borders" page
In the "Borders" tab page (shown e.g. in Writer's
"Format" -> "Page Style" dialog), the 2 weld::IconViews
to show the lines presets and the shadow styles are
supposed to always show all items at the same time.
Therefore, there is no need for a GtkScrolledWindow,
as no scrolling is needed. Therefore, drop those parents.
Change-Id: I8d328809dd207443c45dc5ea8b920c9979c09520
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188962
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/cui/uiconfig/ui/borderpage.ui b/cui/uiconfig/ui/borderpage.ui
index a0894be689a7..67bb30a1c6a5 100644
--- a/cui/uiconfig/ui/borderpage.ui
+++ b/cui/uiconfig/ui/borderpage.ui
@@ -131,22 +131,13 @@
</packing>
</child>
<child>
- <object class="GtkScrolledWindow" id="presets_scrolled_window">
+ <object class="GtkIconView" id="presets">
<property name="visible">True</property>
<property name="can-focus">True</property>
- <property name="hscrollbar-policy">never</property>
- <property name="vscrollbar-policy">never</property>
- <property name="shadow-type">in</property>
- <child>
- <object class="GtkIconView" id="presets">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="model">presets_liststore</property>
- <property name="pixbuf-column">0</property>
- <property name="columns">5</property>
- <property name="activate-on-single-click">True</property>
- </object>
- </child>
+ <property name="model">presets_liststore</property>
+ <property name="pixbuf-column">0</property>
+ <property name="columns">5</property>
+ <property name="activate-on-single-click">True</property>
</object>
<packing>
<property name="left-attach">1</property>
@@ -548,22 +539,13 @@
<property name="row-spacing">3</property>
<property name="column-spacing">6</property>
<child>
- <object class="GtkScrolledWindow" id="shadows_scrolled_window">
+ <object class="GtkIconView" id="shadows">
<property name="visible">True</property>
<property name="can-focus">True</property>
- <property name="hscrollbar-policy">never</property>
- <property name="vscrollbar-policy">never</property>
- <property name="shadow-type">in</property>
- <child>
- <object class="GtkIconView" id="shadows">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="model">shadows_liststore</property>
- <property name="pixbuf-column">0</property>
- <property name="columns">5</property>
- <property name="activate-on-single-click">True</property>
- </object>
- </child>
+ <property name="model">shadows_liststore</property>
+ <property name="pixbuf-column">0</property>
+ <property name="columns">5</property>
+ <property name="activate-on-single-click">True</property>
</object>
<packing>
<property name="left-attach">1</property>
