gtkfilechoosercell: Don't use ColumnViewCell

This partially reverts ccae75022b.
Since FileChooserCell is used for ColumnView and GridView we should
treat the list item as a GtkListItem, not a ColumnViewCell otherwise
the menu fails to generate properly.
This commit is contained in:
Corey Berla
2023-09-05 12:45:34 -07:00
parent 913a6ddcc9
commit ddc7e36543

View File

@@ -23,7 +23,6 @@
#include "gtkprivate.h"
#include "gtkbinlayout.h"
#include "gtkcolumnviewcell.h"
#include "gtkdragsource.h"
#include "gtkgestureclick.h"
#include "gtkgesturelongpress.h"
@@ -37,7 +36,7 @@ struct _GtkFileChooserCell
GtkWidget parent_instance;
GFileInfo *item;
GtkColumnViewCell *list_item;
GtkListItem *list_item;
};
struct _GtkFileChooserCellClass
@@ -75,7 +74,7 @@ popup_menu (GtkFileChooserCell *self,
if (self->list_item)
gtk_widget_activate_action (widget, "item.popup-file-list-menu",
"(udd)", gtk_column_view_cell_get_position (self->list_item), p.x, p.y);
"(udd)", gtk_list_item_get_position (self->list_item), p.x, p.y);
}
static void
@@ -121,7 +120,7 @@ drag_prepare_cb (GtkDragSource *source,
impl = GTK_FILE_CHOOSER_WIDGET (gtk_widget_get_ancestor (GTK_WIDGET (self),
GTK_TYPE_FILE_CHOOSER_WIDGET));
if (self->list_item && !gtk_column_view_cell_get_selected (self->list_item))
if (self->list_item && !gtk_list_item_get_selected (self->list_item))
{
gtk_widget_activate_action (GTK_WIDGET (self), "listitem.select", "(bb)", FALSE, FALSE);
}