mirror of https://github.com/GNOME/gimp.git
as some kind of workaround for bug #459518, show the fallback icon when
2007-10-08 Sven Neumann <sven@gimp.org> * app/widgets/gimpviewrendererimage.c (gimp_view_renderer_image_render): as some kind of workaround for bug #459518, show the fallback icon when rendering the preview for an invisible channel. svn path=/trunk/; revision=23768
This commit is contained in:
Sven Neumann
Sven Neumann
parent
38f72c00ac
commit
1446520338
|
|
@ -63,99 +63,108 @@ gimp_view_renderer_image_render (GimpViewRenderer *renderer,
|
||||||
GtkWidget *widget)
|
GtkWidget *widget)
|
||||||
{
|
{
|
||||||
GimpViewRendererImage *rendererimage = GIMP_VIEW_RENDERER_IMAGE (renderer);
|
GimpViewRendererImage *rendererimage = GIMP_VIEW_RENDERER_IMAGE (renderer);
|
||||||
GimpImage *image;
|
GimpImage *image = GIMP_IMAGE (renderer->viewable);
|
||||||
gint view_width;
|
const gchar *stock_id;
|
||||||
gint view_height;
|
|
||||||
gboolean scaling_up;
|
|
||||||
TempBuf *render_buf = NULL;
|
|
||||||
|
|
||||||
image = GIMP_IMAGE (renderer->viewable);
|
/* The conditions checked here are mostly a hack to hide the fact that
|
||||||
|
* we are creating the channel preview from the image preview and turning
|
||||||
gimp_viewable_calc_preview_size (image->width,
|
* off visibility of a channel has the side-effect of painting the channel
|
||||||
image->height,
|
* preview all black. See bug #459518 for details.
|
||||||
renderer->width,
|
*/
|
||||||
renderer->height,
|
if (rendererimage->channel == -1 ||
|
||||||
renderer->dot_for_dot,
|
(gimp_image_get_component_visible (image, rendererimage->channel) &&
|
||||||
image->xresolution,
|
gimp_image_get_component_visible (image, GIMP_ALPHA_CHANNEL)))
|
||||||
image->yresolution,
|
|
||||||
&view_width,
|
|
||||||
&view_height,
|
|
||||||
&scaling_up);
|
|
||||||
|
|
||||||
if (scaling_up)
|
|
||||||
{
|
{
|
||||||
TempBuf *temp_buf;
|
gint view_width;
|
||||||
|
gint view_height;
|
||||||
|
gboolean scaling_up;
|
||||||
|
TempBuf *render_buf = NULL;
|
||||||
|
|
||||||
temp_buf = gimp_viewable_get_new_preview (renderer->viewable,
|
gimp_viewable_calc_preview_size (image->width,
|
||||||
renderer->context,
|
image->height,
|
||||||
image->width, image->height);
|
renderer->width,
|
||||||
|
renderer->height,
|
||||||
|
renderer->dot_for_dot,
|
||||||
|
image->xresolution,
|
||||||
|
image->yresolution,
|
||||||
|
&view_width,
|
||||||
|
&view_height,
|
||||||
|
&scaling_up);
|
||||||
|
|
||||||
if (temp_buf)
|
if (scaling_up)
|
||||||
{
|
|
||||||
render_buf = temp_buf_scale (temp_buf, view_width, view_height);
|
|
||||||
|
|
||||||
temp_buf_free (temp_buf);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
render_buf = gimp_viewable_get_new_preview (renderer->viewable,
|
|
||||||
renderer->context,
|
|
||||||
view_width,
|
|
||||||
view_height);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (render_buf)
|
|
||||||
{
|
|
||||||
gint component_index = -1;
|
|
||||||
|
|
||||||
/* xresolution != yresolution */
|
|
||||||
if (view_width > renderer->width || view_height > renderer->height)
|
|
||||||
{
|
{
|
||||||
TempBuf *temp_buf;
|
TempBuf *temp_buf;
|
||||||
|
|
||||||
temp_buf = temp_buf_scale (render_buf,
|
temp_buf = gimp_viewable_get_new_preview (renderer->viewable,
|
||||||
renderer->width, renderer->height);
|
renderer->context,
|
||||||
|
image->width,
|
||||||
|
image->height);
|
||||||
|
|
||||||
|
if (temp_buf)
|
||||||
|
{
|
||||||
|
render_buf = temp_buf_scale (temp_buf, view_width, view_height);
|
||||||
|
|
||||||
|
temp_buf_free (temp_buf);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
render_buf = gimp_viewable_get_new_preview (renderer->viewable,
|
||||||
|
renderer->context,
|
||||||
|
view_width,
|
||||||
|
view_height);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (render_buf)
|
||||||
|
{
|
||||||
|
gint component_index = -1;
|
||||||
|
|
||||||
|
/* xresolution != yresolution */
|
||||||
|
if (view_width > renderer->width || view_height > renderer->height)
|
||||||
|
{
|
||||||
|
TempBuf *temp_buf;
|
||||||
|
|
||||||
|
temp_buf = temp_buf_scale (render_buf,
|
||||||
|
renderer->width, renderer->height);
|
||||||
|
|
||||||
|
temp_buf_free (render_buf);
|
||||||
|
render_buf = temp_buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (view_width < renderer->width)
|
||||||
|
render_buf->x = (renderer->width - view_width) / 2;
|
||||||
|
|
||||||
|
if (view_height < renderer->height)
|
||||||
|
render_buf->y = (renderer->height - view_height) / 2;
|
||||||
|
|
||||||
|
if (rendererimage->channel != -1)
|
||||||
|
component_index =
|
||||||
|
gimp_image_get_component_index (image, rendererimage->channel);
|
||||||
|
|
||||||
|
gimp_view_renderer_render_buffer (renderer, render_buf,
|
||||||
|
component_index,
|
||||||
|
GIMP_VIEW_BG_CHECKS,
|
||||||
|
GIMP_VIEW_BG_WHITE);
|
||||||
|
|
||||||
temp_buf_free (render_buf);
|
temp_buf_free (render_buf);
|
||||||
render_buf = temp_buf;
|
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (view_width < renderer->width)
|
|
||||||
render_buf->x = (renderer->width - view_width) / 2;
|
|
||||||
|
|
||||||
if (view_height < renderer->height)
|
|
||||||
render_buf->y = (renderer->height - view_height) / 2;
|
|
||||||
|
|
||||||
if (rendererimage->channel != -1)
|
|
||||||
component_index =
|
|
||||||
gimp_image_get_component_index (image, rendererimage->channel);
|
|
||||||
|
|
||||||
gimp_view_renderer_render_buffer (renderer, render_buf,
|
|
||||||
component_index,
|
|
||||||
GIMP_VIEW_BG_CHECKS,
|
|
||||||
GIMP_VIEW_BG_WHITE);
|
|
||||||
|
|
||||||
temp_buf_free (render_buf);
|
|
||||||
}
|
}
|
||||||
else
|
|
||||||
|
switch (rendererimage->channel)
|
||||||
{
|
{
|
||||||
const gchar *stock_id;
|
case GIMP_RED_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_RED; break;
|
||||||
|
case GIMP_GREEN_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_GREEN; break;
|
||||||
|
case GIMP_BLUE_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_BLUE; break;
|
||||||
|
case GIMP_GRAY_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_GRAY; break;
|
||||||
|
case GIMP_INDEXED_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_INDEXED; break;
|
||||||
|
case GIMP_ALPHA_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_ALPHA; break;
|
||||||
|
|
||||||
switch (rendererimage->channel)
|
default:
|
||||||
{
|
stock_id = gimp_viewable_get_stock_id (renderer->viewable);
|
||||||
case GIMP_RED_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_RED; break;
|
break;
|
||||||
case GIMP_GREEN_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_GREEN; break;
|
|
||||||
case GIMP_BLUE_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_BLUE; break;
|
|
||||||
case GIMP_GRAY_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_GRAY; break;
|
|
||||||
case GIMP_INDEXED_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_INDEXED; break;
|
|
||||||
case GIMP_ALPHA_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_ALPHA; break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
stock_id = gimp_viewable_get_stock_id (renderer->viewable);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
gimp_view_renderer_default_render_stock (renderer, widget, stock_id);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gimp_view_renderer_default_render_stock (renderer, widget, stock_id);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue