Commit e6983567 authored by Michael Natterer's avatar Michael Natterer 😴
Browse files

app: add GimpContainerIconView, a new GimpContainerView based on GtkIconView

This is supposed to finally replace GimpContainerGridView along with
GtkWrapBox. The code is experimental and currently even crashes
without a modified GTK+, so it's disabled. Keeping it in GIT makes
developing easier though.
parent a3b93151
......@@ -79,6 +79,8 @@ libappwidgets_a_sources = \
gimpcontainerentry.h \
gimpcontainergridview.c \
gimpcontainergridview.h \
gimpcontainericonview.c \
gimpcontainericonview.h \
gimpcontainerpopup.c \
gimpcontainerpopup.h \
gimpcontainertreestore.c \
......
......@@ -32,6 +32,7 @@
#include "gimpcontainereditor.h"
#include "gimpcontainergridview.h"
#include "gimpcontainericonview.h"
#include "gimpcontainertreeview.h"
#include "gimpcontainerview.h"
#include "gimpdocked.h"
......@@ -130,11 +131,19 @@ gimp_container_editor_construct (GimpContainerEditor *editor,
switch (view_type)
{
case GIMP_VIEW_TYPE_GRID:
#if 0
editor->view =
GIMP_CONTAINER_VIEW (gimp_container_icon_view_new (container,
context,
view_size,
view_border_width));
#else
editor->view =
GIMP_CONTAINER_VIEW (gimp_container_grid_view_new (container,
context,
view_size,
view_border_width));
#endif
break;
case GIMP_VIEW_TYPE_LIST:
......
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimpcontainericonview.c
* Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <string.h>
#include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "widgets-types.h"
#include "core/gimpcontainer.h"
#include "core/gimpcontext.h"
#include "core/gimpviewable.h"
#include "gimpcellrendererviewable.h"
#include "gimpcontainertreestore.h"
#include "gimpcontainericonview.h"
#include "gimpcontainerview.h"
#include "gimpdnd.h"
#include "gimpviewrenderer.h"
#include "gimpwidgets-utils.h"
struct _GimpContainerIconViewPriv
{
gint dummy;
};
static void gimp_container_icon_view_view_iface_init (GimpContainerViewInterface *iface);
static GObject * gimp_container_icon_view_constructor (GType type,
guint n_params,
GObjectConstructParam *params);
static void gimp_container_icon_view_finalize (GObject *object);
static void gimp_container_icon_view_unmap (GtkWidget *widget);
static gboolean gimp_container_icon_view_popup_menu (GtkWidget *widget);
static void gimp_container_icon_view_set_container (GimpContainerView *view,
GimpContainer *container);
static void gimp_container_icon_view_set_context (GimpContainerView *view,
GimpContext *context);
static void gimp_container_icon_view_set_selection_mode(GimpContainerView *view,
GtkSelectionMode mode);
static gpointer gimp_container_icon_view_insert_item (GimpContainerView *view,
GimpViewable *viewable,
gpointer parent_insert_data,
gint index);
static void gimp_container_icon_view_remove_item (GimpContainerView *view,
GimpViewable *viewable,
gpointer insert_data);
static void gimp_container_icon_view_reorder_item (GimpContainerView *view,
GimpViewable *viewable,
gint new_index,
gpointer insert_data);
static void gimp_container_icon_view_rename_item (GimpContainerView *view,
GimpViewable *viewable,
gpointer insert_data);
static gboolean gimp_container_icon_view_select_item (GimpContainerView *view,
GimpViewable *viewable,
gpointer insert_data);
static void gimp_container_icon_view_clear_items (GimpContainerView *view);
static void gimp_container_icon_view_set_view_size (GimpContainerView *view);
static void gimp_container_icon_view_selection_changed (GtkIconView *view,
GimpContainerIconView *icon_view);
static void gimp_container_icon_view_item_activated (GtkIconView *view,
GtkTreePath *path,
GimpContainerIconView *icon_view);
static gboolean gimp_container_icon_view_tooltip (GtkWidget *widget,
gint x,
gint y,
gboolean keyboard_tip,
GtkTooltip *tooltip,
GimpContainerIconView *icon_view);
static GimpViewable * gimp_container_icon_view_drag_viewable (GtkWidget *widget,
GimpContext **context,
gpointer data);
static GdkPixbuf * gimp_container_icon_view_drag_pixbuf (GtkWidget *widget,
gpointer data);
static gboolean gimp_container_icon_view_get_selected_single (GimpContainerIconView *icon_view,
GtkTreeIter *iter);
static gint gimp_container_icon_view_get_selected (GimpContainerView *view,
GList **items);
G_DEFINE_TYPE_WITH_CODE (GimpContainerIconView, gimp_container_icon_view,
GIMP_TYPE_CONTAINER_BOX,
G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONTAINER_VIEW,
gimp_container_icon_view_view_iface_init))
#define parent_class gimp_container_icon_view_parent_class
static GimpContainerViewInterface *parent_view_iface = NULL;
static void
gimp_container_icon_view_class_init (GimpContainerIconViewClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
object_class->constructor = gimp_container_icon_view_constructor;
object_class->finalize = gimp_container_icon_view_finalize;
widget_class->unmap = gimp_container_icon_view_unmap;
widget_class->popup_menu = gimp_container_icon_view_popup_menu;
g_type_class_add_private (klass, sizeof (GimpContainerIconViewPriv));
}
static void
gimp_container_icon_view_view_iface_init (GimpContainerViewInterface *iface)
{
parent_view_iface = g_type_interface_peek_parent (iface);
if (! parent_view_iface)
parent_view_iface = g_type_default_interface_peek (GIMP_TYPE_CONTAINER_VIEW);
iface->set_container = gimp_container_icon_view_set_container;
iface->set_context = gimp_container_icon_view_set_context;
iface->set_selection_mode = gimp_container_icon_view_set_selection_mode;
iface->insert_item = gimp_container_icon_view_insert_item;
iface->remove_item = gimp_container_icon_view_remove_item;
iface->reorder_item = gimp_container_icon_view_reorder_item;
iface->rename_item = gimp_container_icon_view_rename_item;
iface->select_item = gimp_container_icon_view_select_item;
iface->clear_items = gimp_container_icon_view_clear_items;
iface->set_view_size = gimp_container_icon_view_set_view_size;
iface->get_selected = gimp_container_icon_view_get_selected;
iface->insert_data_free = (GDestroyNotify) gtk_tree_iter_free;
}
static void
gimp_container_icon_view_init (GimpContainerIconView *icon_view)
{
GimpContainerBox *box = GIMP_CONTAINER_BOX (icon_view);
icon_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (icon_view,
GIMP_TYPE_CONTAINER_ICON_VIEW,
GimpContainerIconViewPriv);
gimp_container_tree_store_columns_init (icon_view->model_columns,
&icon_view->n_model_columns);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (box->scrolled_win),
GTK_SHADOW_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (box->scrolled_win),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
}
static GObject *
gimp_container_icon_view_constructor (GType type,
guint n_params,
GObjectConstructParam *params)
{
GimpContainerIconView *icon_view;
GimpContainerView *view;
GimpContainerBox *box;
GObject *object;
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
icon_view = GIMP_CONTAINER_ICON_VIEW (object);
view = GIMP_CONTAINER_VIEW (object);
box = GIMP_CONTAINER_BOX (object);
icon_view->model = gimp_container_tree_store_new (view,
icon_view->n_model_columns,
icon_view->model_columns);
icon_view->view = g_object_new (GTK_TYPE_ICON_VIEW,
"model", icon_view->model,
"row-spacing", 0,
"column-spacing", 0,
"margin", 0,
"item-padding", 1,
"has-tooltip", TRUE,
NULL);
g_object_unref (icon_view->model);
gtk_container_add (GTK_CONTAINER (box->scrolled_win),
GTK_WIDGET (icon_view->view));
gtk_widget_show (GTK_WIDGET (icon_view->view));
gimp_container_view_set_dnd_widget (view, GTK_WIDGET (icon_view->view));
icon_view->renderer_cell = gimp_cell_renderer_viewable_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (icon_view->view),
icon_view->renderer_cell,
FALSE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (icon_view->view),
icon_view->renderer_cell,
"renderer", GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER,
NULL);
gimp_container_tree_store_add_renderer_cell (GIMP_CONTAINER_TREE_STORE (icon_view->model),
icon_view->renderer_cell);
g_signal_connect (icon_view->view, "selection-changed",
G_CALLBACK (gimp_container_icon_view_selection_changed),
icon_view);
g_signal_connect (icon_view->view, "item-activated",
G_CALLBACK (gimp_container_icon_view_item_activated),
icon_view);
g_signal_connect (icon_view->view, "query-tooltip",
G_CALLBACK (gimp_container_icon_view_tooltip),
icon_view);
return object;
}
static void
gimp_container_icon_view_finalize (GObject *object)
{
//GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (object);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void
gimp_container_icon_view_unmap (GtkWidget *widget)
{
//GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (widget);
GTK_WIDGET_CLASS (parent_class)->unmap (widget);
}
static void
gimp_container_icon_view_menu_position (GtkMenu *menu,
gint *x,
gint *y,
gpointer data)
{
GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (data);
GtkWidget *widget = GTK_WIDGET (icon_view->view);
GtkAllocation allocation;
#if 0
GtkTreeIter selected_iter;
#endif
gtk_widget_get_allocation (widget, &allocation);
gdk_window_get_origin (gtk_widget_get_window (widget), x, y);
if (! gtk_widget_get_has_window (widget))
{
*x += allocation.x;
*y += allocation.y;
}
#if 0
if (gimp_container_icon_view_get_selected_single (icon_view, &selected_iter))
{
GtkTreePath *path;
GdkRectangle cell_rect;
gint center;
path = gtk_tree_model_get_path (icon_view->model, &selected_iter);
gtk_icon_view_get_cell_area (icon_view->view, path,
icon_view->main_column, &cell_rect);
gtk_tree_path_free (path);
center = cell_rect.y + cell_rect.height / 2;
center = CLAMP (center, 0, allocation.height);
*x += allocation.width / 2;
*y += center;
}
else
#endif
{
GtkStyle *style = gtk_widget_get_style (widget);
*x += style->xthickness;
*y += style->ythickness;
}
gimp_menu_position (menu, x, y);
}
static gboolean
gimp_container_icon_view_popup_menu (GtkWidget *widget)
{
return gimp_editor_popup_menu (GIMP_EDITOR (widget),
gimp_container_icon_view_menu_position,
widget);
}
GtkWidget *
gimp_container_icon_view_new (GimpContainer *container,
GimpContext *context,
gint view_size,
gint view_border_width)
{
GimpContainerIconView *icon_view;
GimpContainerView *view;
g_return_val_if_fail (container == NULL || GIMP_IS_CONTAINER (container),
NULL);
g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
g_return_val_if_fail (view_size > 0 &&
view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
g_return_val_if_fail (view_border_width >= 0 &&
view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
NULL);
icon_view = g_object_new (GIMP_TYPE_CONTAINER_ICON_VIEW, NULL);
view = GIMP_CONTAINER_VIEW (icon_view);
gimp_container_view_set_view_size (view, view_size, 0 /* ignore border */);
if (container)
gimp_container_view_set_container (view, container);
if (context)
gimp_container_view_set_context (view, context);
return GTK_WIDGET (icon_view);
}
/* GimpContainerView methods */
static void
gimp_container_icon_view_set_container (GimpContainerView *view,
GimpContainer *container)
{
GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
GimpContainer *old_container;
old_container = gimp_container_view_get_container (view);
if (old_container)
{
if (! container)
{
if (gimp_dnd_viewable_source_remove (GTK_WIDGET (icon_view->view),
gimp_container_get_children_type (old_container)))
{
if (GIMP_VIEWABLE_CLASS (g_type_class_peek (gimp_container_get_children_type (old_container)))->get_size)
gimp_dnd_pixbuf_source_remove (GTK_WIDGET (icon_view->view));
gtk_drag_source_unset (GTK_WIDGET (icon_view->view));
}
}
}
else if (container)
{
if (gimp_dnd_drag_source_set_by_type (GTK_WIDGET (icon_view->view),
GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
gimp_container_get_children_type (container),
GDK_ACTION_COPY))
{
gimp_dnd_viewable_source_add (GTK_WIDGET (icon_view->view),
gimp_container_get_children_type (container),
gimp_container_icon_view_drag_viewable,
icon_view);
if (GIMP_VIEWABLE_CLASS (g_type_class_peek (gimp_container_get_children_type (container)))->get_size)
gimp_dnd_pixbuf_source_add (GTK_WIDGET (icon_view->view),
gimp_container_icon_view_drag_pixbuf,
icon_view);
}
}
parent_view_iface->set_container (view, container);
}
static void
gimp_container_icon_view_set_context (GimpContainerView *view,
GimpContext *context)
{
GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
parent_view_iface->set_context (view, context);
if (icon_view->model)
gimp_container_tree_store_set_context (GIMP_CONTAINER_TREE_STORE (icon_view->model),
context);
}
static void
gimp_container_icon_view_set_selection_mode (GimpContainerView *view,
GtkSelectionMode mode)
{
GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
gtk_icon_view_set_selection_mode (icon_view->view, mode);
parent_view_iface->set_selection_mode (view, mode);
}
static gpointer
gimp_container_icon_view_insert_item (GimpContainerView *view,
GimpViewable *viewable,
gpointer parent_insert_data,
gint index)
{
GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
GtkTreeIter *iter;
iter = gimp_container_tree_store_insert_item (GIMP_CONTAINER_TREE_STORE (icon_view->model),
viewable,
parent_insert_data,
index);
if (parent_insert_data)
{
#if 0
GtkTreePath *path = gtk_tree_model_get_path (icon_view->model, iter);
gtk_icon_view_expand_to_path (icon_view->view, path);
gtk_tree_path_free (path);
#endif
}
return iter;
}
static void
gimp_container_icon_view_remove_item (GimpContainerView *view,
GimpViewable *viewable,
gpointer insert_data)
{
GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
gimp_container_tree_store_remove_item (GIMP_CONTAINER_TREE_STORE (icon_view->model),
viewable,
insert_data);
}
static void
gimp_container_icon_view_reorder_item (GimpContainerView *view,
GimpViewable *viewable,
gint new_index,
gpointer insert_data)
{
GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
GtkTreeIter *iter = (GtkTreeIter *) insert_data;
gboolean selected = FALSE;
if (iter)
{
GtkTreeIter selected_iter;
selected = gimp_container_icon_view_get_selected_single (icon_view,
&selected_iter);
if (selected)
{
GimpViewRenderer *renderer;
gtk_tree_model_get (icon_view->model, &selected_iter,
GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer,
-1);
if (renderer->viewable != viewable)
selected = FALSE;
g_object_unref (renderer);
}
}
gimp_container_tree_store_reorder_item (GIMP_CONTAINER_TREE_STORE (icon_view->model),
viewable,
new_index,
iter);
if (selected)
gimp_container_view_select_item (view, viewable);
}
static void
gimp_container_icon_view_rename_item (GimpContainerView *view,
GimpViewable *viewable,
gpointer insert_data)
{
GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
GtkTreeIter *iter = (GtkTreeIter *) insert_data;
gimp_container_tree_store_rename_item (GIMP_CONTAINER_TREE_STORE (icon_view->model),
viewable,
iter);
}
static gboolean
gimp_container_icon_view_select_item (GimpContainerView *view,
GimpViewable *viewable,
gpointer insert_data)
{
GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
if (viewable && insert_data)
{
GtkTreePath *path;
GtkTreePath *parent_path;
GtkTreeIter *iter = (GtkTreeIter *) insert_data;
path = gtk_tree_model_get_path (icon_view->model, iter);
parent_path = gtk_tree_path_copy (path);
if (gtk_tree_path_up (parent_path))
;
#if 0
gtk_icon_view_expand_to_path (icon_view->view, parent_path);
#endif
gtk_tree_path_free (parent_path);
g_signal_handlers_block_by_func (icon_view->view,
gimp_container_icon_view_selection_changed,
icon_view);
gtk_icon_view_set_cursor (icon_view->view, path, NULL, FALSE);
g_signal_handlers_unblock_by_func (icon_view->view,
gimp_container_icon_view_selection_changed,
icon_view);
gtk_icon_view_scroll_to_path (icon_view->view, path, FALSE, 0.0, 0.0);
gtk_tree_path_free (path);
}
else if (insert_data == NULL)
{
/* viewable == NULL && insert_data != NULL means multiple selection.
* viewable == NULL && insert_data == NULL means no selection. */
gtk_icon_view_unselect_all (icon_view->view);
}
return TRUE;
}
static void
gimp_container_icon_view_clear_items (GimpContainerView *view)
{
GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
gimp_container_tree_store_clear_items (GIMP_CONTAINER_TREE_STORE (icon_view->model));
parent_view_iface->clear_items (view);
}
static void
gimp_container_icon_view_set_view_size (GimpContainerView *view)
{
GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
if (icon_view->model)
gimp_container_tree_store_set_view_size (GIMP_CONTAINER_TREE_STORE (icon_view->model));