dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Issue #1608: Gimp 2.10.0 and 2.10.2 crash immediately on start." 

This reverts commit 7886bdc2a9.
Not needed anymore since commit cb7cae2fec.
Now gimp_widget_load_icon() always returns non-NULL.
This commit is contained in:
Jehan 2018-06-24 18:22:43 +02:00
parent 123dcc6f3f
commit a6e77355d8
1 changed files with 21 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
app/widgets/gimpfgbgeditor.c
View File

@ -251,10 +251,8 @@ gimp_fg_bg_editor_draw (GtkWidget *widget,
GtkBorder padding;
GdkRectangle rect;
gint width, height;
gint default_w = 0;
gint default_h = 0;
gint swap_w = 0;
gint swap_h = 0;
gint default_w, default_h;
gint swap_w, swap_h;
GimpRGB color;
GimpRGB transformed_color;
@ -278,67 +276,39 @@ gimp_fg_bg_editor_draw (GtkWidget *widget,
editor->default_icon = gimp_widget_load_icon (widget,
GIMP_ICON_COLORS_DEFAULT, 12);
if (editor->default_icon)
{
default_w = gdk_pixbuf_get_width (editor->default_icon);
default_h = gdk_pixbuf_get_height (editor->default_icon);
default_w = gdk_pixbuf_get_width (editor->default_icon);
default_h = gdk_pixbuf_get_height (editor->default_icon);
if (default_w < width / 2 && default_h < height / 2)
{
gdk_cairo_set_source_pixbuf (cr, editor->default_icon,
border.left,
height - border.bottom - default_h);
cairo_paint (cr);
}
else
{
default_w = default_h = 0;
}
if (default_w < width / 2 && default_h < height / 2)
{
gdk_cairo_set_source_pixbuf (cr, editor->default_icon,
border.left,
height - border.bottom - default_h);
cairo_paint (cr);
}
else
{
g_printerr ("%s: invisible default colors area because of "
"missing or broken icons in your theme.\n",
G_STRFUNC);
/* If icon is too small, we may not draw it but still assigns some
* dimensions for the default color area, which will still exist,
* though not designated by an icon.
*/
default_w = width / 4;
default_h = height / 4;
default_w = default_h = 0;
}
/* draw the swap colors pixbuf */
if (! editor->swap_icon)
editor->swap_icon = gimp_widget_load_icon (widget,
GIMP_ICON_COLORS_SWAP, 12);
if (editor->swap_icon)
{
swap_w = gdk_pixbuf_get_width (editor->swap_icon);
swap_h = gdk_pixbuf_get_height (editor->swap_icon);
if (swap_w < width / 2 && swap_h < height / 2)
{
gdk_cairo_set_source_pixbuf (cr, editor->swap_icon,
width - border.right - swap_w,
border.top);
cairo_paint (cr);
}
else
{
swap_w = swap_h = 0;
}
swap_w = gdk_pixbuf_get_width (editor->swap_icon);
swap_h = gdk_pixbuf_get_height (editor->swap_icon);
if (swap_w < width / 2 && swap_h < height / 2)
{
gdk_cairo_set_source_pixbuf (cr, editor->swap_icon,
width - border.right - swap_w,
border.top);
cairo_paint (cr);
}
else
{
g_printerr ("%s: invisible color swap area because of missing or "
"broken icons in your theme.\n", G_STRFUNC);
/* If icon is too small, we may not draw it but still assigns some
* dimensions for the color swap area, which will still exist,
* though not designated by an icon.
*/
swap_w = width / 4;
swap_h = height / 4;
swap_w = swap_h = 0;
}
rect.width = width - MAX (default_w, swap_w) - 4 - border.top - border.bottom;