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

made the navigation popup respect the aspect ratio of the selection or the 

* libgimp/gimpdrawablepreview.c: made the navigation popup respect the
  aspect ratio of the selection or the drawable.
This commit is contained in:
David Odin 2005-10-08 23:08:12 +00:00
parent 1f50357015
commit fb5707241e
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-10-09 DindinX <dindinx@gimp.org>
* libgimp/gimpdrawablepreview.c: made the navigation popup respect the
aspect ratio of the selection or the drawable.
2005-10-08 Karine Delvare <kdelvare@nerim.net> 2005-10-08 Karine Delvare <kdelvare@nerim.net>
* app/tools/gimpcroptool.c * app/tools/gimpcroptool.c

34
libgimp/gimpdrawablepreview.c
View File

@ -208,27 +208,51 @@ gimp_drawable_preview_draw_thumb (GimpPreview *preview,
guchar *buffer; guchar *buffer;
gint x1, y1, x2, y2; gint x1, y1, x2, y2;
gint bpp; gint bpp;
gint size = 100;
gint nav_width, nav_height;
if (! drawable) if (! drawable)
return; return;
if (gimp_drawable_preview_get_bounds (drawable, &x1, &y1, &x2, &y2))
{
width = x2 - x1;
height = y2 - y1;
}
else
{
width = gimp_drawable_width (drawable->drawable_id);
height = gimp_drawable_height (drawable->drawable_id);
}
if (width > height)
{
nav_width = MIN (width, size);
nav_height = (height * nav_width) / width;
}
else
{
nav_height = MIN (height, size);
nav_width = (width * nav_height) / height;
}
if (gimp_drawable_preview_get_bounds (drawable, &x1, &y1, &x2, &y2)) if (gimp_drawable_preview_get_bounds (drawable, &x1, &y1, &x2, &y2))
{ {
buffer = gimp_drawable_get_sub_thumbnail_data (drawable->drawable_id, buffer = gimp_drawable_get_sub_thumbnail_data (drawable->drawable_id,
x1, y1, x2 - x1, y2 - y1, x1, y1, x2 - x1, y2 - y1,
&width, &height, &bpp); &nav_width, &nav_height, &bpp);
} }
else else
{ {
buffer = gimp_drawable_get_thumbnail_data (drawable->drawable_id, buffer = gimp_drawable_get_thumbnail_data (drawable->drawable_id,
&width, &height, &bpp); &nav_width, &nav_height, &bpp);
} }
if (buffer) if (buffer)
{ {
GimpImageType type; GimpImageType type;
gtk_widget_set_size_request (GTK_WIDGET (area), width, height); gtk_widget_set_size_request (GTK_WIDGET (area), nav_width, nav_height);
gtk_widget_show (GTK_WIDGET (area)); gtk_widget_show (GTK_WIDGET (area));
gtk_widget_realize (GTK_WIDGET (area)); gtk_widget_realize (GTK_WIDGET (area));
@ -244,8 +268,8 @@ gimp_drawable_preview_draw_thumb (GimpPreview *preview,
} }
gimp_preview_area_draw (area, gimp_preview_area_draw (area,
0, 0, width, height, 0, 0, nav_width, nav_height,
type, buffer, bpp * width); type, buffer, bpp * nav_width);
g_free (buffer); g_free (buffer);
} }