From 03012f8f60f545e5dfc68a5ec08ba928c1c58789 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Wed, 26 Jun 2024 09:39:23 +0200
Subject: [PATCH] Disable column reordering of FolderDisplay

Resolves: RHEL-40874, RHEL-40875
---
 ...e-column-reordering-of-FolderDisplay.patch | 58 +++++++++++++++++++
 baobab.spec                                   |  7 +++
 2 files changed, 65 insertions(+)
 create mode 100644 Disable-column-reordering-of-FolderDisplay.patch

diff --git a/Disable-column-reordering-of-FolderDisplay.patch b/Disable-column-reordering-of-FolderDisplay.patch
new file mode 100644
index 0000000..c03e088
--- /dev/null
+++ b/Disable-column-reordering-of-FolderDisplay.patch
@@ -0,0 +1,58 @@
+From a3b597b7a2f02b4ba7466bfa1ea4a306a883728f Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Thu, 13 Jun 2024 11:50:30 +0200
+Subject: [PATCH] Disable column reordering of FolderDisplay
+
+Currently, it is possible to reorder columns of the `BaobabFolderDisplay`
+widget using drag and drop. However, there are some issues with this
+feature. The new column order is applied only to the first row and not to
+the others that are part of the separate `treeview` widget. Another
+problem	is that dragging the "Folder" column sometimes significantly
+increases the window width. Let's disable the column reordering until
+those issues are resolved.
+
+Related: https://issues.redhat.com/browse/RHEL-40874
+Related: https://issues.redhat.com/browse/RHEL-40875
+---
+ data/ui/baobab-folder-display.ui | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/data/ui/baobab-folder-display.ui b/data/ui/baobab-folder-display.ui
+index 7e585c7..6466b18 100644
+--- a/data/ui/baobab-folder-display.ui
++++ b/data/ui/baobab-folder-display.ui
+@@ -13,7 +13,6 @@
+       <object class="GtkTreeViewColumn" id="folder_column">
+         <property name="title" translatable="yes">Folder</property>
+         <property name="expand">True</property>
+-        <property name="reorderable">True</property>
+         <property name="sort_column_id">0</property>
+         <child>
+           <object class="GtkCellRendererPixbuf" id="folder_column_icon_renderer">
+@@ -35,7 +34,6 @@
+     <child>
+       <object class="GtkTreeViewColumn" id="size_column">
+         <property name="title" translatable="yes">Size</property>
+-        <property name="reorderable">True</property>
+         <property name="sort_column_id">2</property>
+         <child>
+           <object class="BaobabCellRendererSize" id="size_column_size_renderer">
+@@ -51,7 +49,6 @@
+     <child>
+       <object class="GtkTreeViewColumn" id="contents_column">
+         <property name="title" translatable="yes">Contents</property>
+-        <property name="reorderable">True</property>
+         <property name="sort_column_id">5</property>
+         <child>
+           <object class="BaobabCellRendererItems" id="contents_column_items_renderer">
+@@ -67,7 +64,6 @@
+     <child>
+       <object class="GtkTreeViewColumn" id="time_modified_column">
+         <property name="title" translatable="yes">Modified</property>
+-        <property name="reorderable">True</property>
+         <property name="sort_column_id">3</property>
+         <child>
+           <object class="BaobabCellRendererTime" id="modified_column_time_renderer">
+-- 
+2.45.1
+
diff --git a/baobab.spec b/baobab.spec
index 292181f..9277340 100644
--- a/baobab.spec
+++ b/baobab.spec
@@ -14,6 +14,10 @@ License:        GPL-2.0-or-later AND CC-BY-SA-3.0 AND CC0-1.0
 URL:            https://wiki.gnome.org/Apps/Baobab
 Source0:        https://download.gnome.org/sources/baobab/46/%{name}-%{tarball_version}.tar.xz
 
+# https://issues.redhat.com/browse/RHEL-40874
+# https://issues.redhat.com/browse/RHEL-40875
+Patch:          Disable-column-reordering-of-FolderDisplay.patch
+
 BuildRequires:  pkgconfig(gtk4) >= %{gtk4_version}
 BuildRequires:  pkgconfig(libadwaita-1) >= %{libadwaita_version}
 BuildRequires:  /usr/bin/appstream-util
@@ -66,6 +70,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.baobab.des
 
 
 %changelog
+* Wed Jun 26 2024 Ondrej Holy <oholy@redhat.com> - 46.0-3
+- Disable column reordering of FolderDisplay (RHEL-40874, RHEL-40875)
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 46.0-2
 - Bump release for June 2024 mass rebuild