[gnome-commander/ConfigurableFileListColumns: 21/26] Find the column in which the file type icons should be shown
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander/ConfigurableFileListColumns: 21/26] Find the column in which the file type icons should be shown
- Date: Sun, 12 May 2019 13:19:40 +0000 (UTC)
commit 1dbd3be2670aefa61ca48ef94e6787af21f6c97a
Author: Uwe Scholz <u scholz83 gmx de>
Date: Mon May 6 23:36:50 2019 +0200
Find the column in which the file type icons should be shown
src/gnome-cmd-file-list.cc | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc
index c2441994..6712df42 100644
--- a/src/gnome-cmd-file-list.cc
+++ b/src/gnome-cmd-file-list.cc
@@ -1934,6 +1934,16 @@ GtkSortType GnomeCmdFileList::get_sort_order() const
}
+static guint GetFileTypeColumnId()
+{
+ for (guint ii = GnomeCmdFileList::COLUMN_ICON; ii < GnomeCmdFileList::NUM_COLUMNS; ii++)
+ {
+ if (gnome_cmd_data.fileListColumnLayouts[ii].position == GnomeCmdFileList::COLUMN_ICON)
+ return ii;
+ }
+ return 0;
+}
+
inline void add_file_to_clist (GnomeCmdFileList *fl, GnomeCmdFile *f, gint in_row)
{
GtkCList *clist = *fl;
@@ -1961,6 +1971,8 @@ inline void add_file_to_clist (GnomeCmdFileList *fl, GnomeCmdFile *f, gint in_ro
gtk_clist_set_row_data (clist, row, f);
+ auto fileTypeColumnId = GetFileTypeColumnId();
+
// If the use wants icons to show file types set it now
if (gnome_cmd_data.options.layout != GNOME_CMD_LAYOUT_TEXT)
{
@@ -1968,7 +1980,7 @@ inline void add_file_to_clist (GnomeCmdFileList *fl, GnomeCmdFile *f, gint in_ro
GdkBitmap *mask;
if (f->get_type_pixmap_and_mask(&pixmap, &mask))
- gtk_clist_set_pixmap (clist, row, 0, pixmap, mask);
+ gtk_clist_set_pixmap (clist, row, fileTypeColumnId, pixmap, mask);
}
// If we have been waiting for this file to show up, focus it
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]