dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libgimpwidgets, app: use GdkRGBA instead of GdkColor for cell backgrounds

Browse source
This commit is contained in:
Michael Natterer 2016-11-01 12:50:10 +01:00
parent a6948b4ba5
commit a5b5eaebd3
2 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/widgets/gimpitemtreeview.c
View file

@ -332,7 +332,7 @@ gimp_item_tree_view_init (GimpItemTreeView *view)
view->priv->model_column_color_tag =
gimp_container_tree_store_columns_add (tree_view->model_columns,
&tree_view->n_model_columns,
GDK_TYPE_COLOR);
GDK_TYPE_RGBA);
gimp_container_tree_view_set_dnd_drop_to_empty (tree_view, TRUE);
@ -380,7 +380,7 @@ gimp_item_tree_view_constructed (GObject *object)
item_view->priv->model_column_visible,
"inconsistent",
item_view->priv->model_column_viewable,
"cell-background-gdk",
"cell-background-rgba",
item_view->priv->model_column_color_tag,
NULL);
@ -986,7 +986,6 @@ gimp_item_tree_view_insert_item (GimpContainerView *view,
GimpItem *item = GIMP_ITEM (viewable);
GtkTreeIter *iter;
GimpRGB color;
GdkColor gdk_color;
gboolean has_color;
item_view->priv->inserting_item = TRUE;
@ -1000,8 +999,6 @@ gimp_item_tree_view_insert_item (GimpContainerView *view,
&color,
gimp_item_get_color_tag (item) ==
GIMP_COLOR_TAG_NONE);
if (has_color)
gimp_rgb_get_gdk_color (&color, &gdk_color);
gtk_tree_store_set (GTK_TREE_STORE (tree_view->model), iter,
item_view->priv->model_column_visible,
@ -1012,7 +1009,7 @@ gimp_item_tree_view_insert_item (GimpContainerView *view,
item_view->priv->model_column_linked,
gimp_item_get_linked (item),
item_view->priv->model_column_color_tag,
has_color ? &gdk_color : NULL,
has_color ? (GdkRGBA *) &color : NULL,
-1);
return iter;
@ -1416,19 +1413,16 @@ gimp_item_tree_view_color_tag_changed (GimpItem *item,
{
GimpContainer *children;
GimpRGB color;
GdkColor gdk_color;
gboolean has_color;
has_color = gimp_get_color_tag_color (gimp_item_get_merged_color_tag (item),
&color,
gimp_item_get_color_tag (item) ==
GIMP_COLOR_TAG_NONE);
if (has_color)
gimp_rgb_get_gdk_color (&color, &gdk_color);
gtk_tree_store_set (GTK_TREE_STORE (tree_view->model), iter,
view->priv->model_column_color_tag,
has_color ? &gdk_color : NULL,
has_color ? (GdkRGBA *) &color : NULL,
-1);
children = gimp_viewable_get_children (GIMP_VIEWABLE (item));

10
libgimpwidgets/gimpcellrenderertoggle.c
View file

@ -380,19 +380,17 @@ gimp_cell_renderer_toggle_render (GtkCellRenderer *cell,
if (background_set)
{
cairo_t *cr = gdk_cairo_create (window);
GdkColor *color;
GdkRGBA *color;
g_object_get (cell,
"cell-background-gdk", &color,
"cell-background-rgba", &color,
NULL);
gdk_cairo_rectangle (cr, background_area);
gdk_cairo_set_source_color (cr, color);
gdk_cairo_set_source_rgba (cr, color);
cairo_fill (cr);
gdk_color_free (color);
cairo_destroy (cr);
gdk_rgba_free (color);
}
}