callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

port internal cursor stuff to gdouble, fix off-by-one in curve drawing,

Browse Source 
2008-02-09  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpcurveview.[ch]: port internal cursor stuff to
	gdouble, fix off-by-one in curve drawing, fix drawing artefact in
	handle drawing by starting drawing on the handle's outline and not
	its center.


svn path=/trunk/; revision=24839
This commit is contained in:
Michael Natterer
2008-02-09 11:14:40 +00:00
committed by Michael Natterer
parent e831300587
commit 58c0ba65fc
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-02-09 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpcurveview.[ch]: port internal cursor stuff to
gdouble, fix off-by-one in curve drawing, fix drawing artefact in
handle drawing by starting drawing on the handle's outline and not
its center.
2008-02-09 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpcurveview.[ch]: port the "xpos" API

25
app/widgets/gimpcurveview.c
View File

@ -126,8 +126,8 @@ gimp_curve_view_init (GimpCurveView *view)
view->last_y = 0.0;
view->cursor_type = -1;
view->xpos = -1.0;
view->cursor_x = -1;
view->cursor_y = -1;
view->cursor_x = -1.0;
view->cursor_y = -1.0;
GTK_WIDGET_SET_FLAGS (view, GTK_CAN_FOCUS);
@ -322,7 +322,7 @@ gimp_curve_view_draw_point (GimpCurveView *view,
y = 1.0 - view->curve->points[i][1];
cairo_move_to (cr,
border + (gdouble) width * x,
border + (gdouble) width * x + 3,
border + (gdouble) height * y);
cairo_arc (cr,
border + (gdouble) width * x,
@ -351,8 +351,8 @@ gimp_curve_view_expose (GtkWidget *widget,
border = GIMP_HISTOGRAM_VIEW (view)->border_width;
width = widget->allocation.width - 2 * border;
height = widget->allocation.height - 2 * border;
width = widget->allocation.width - 2 * border - 1;
height = widget->allocation.height - 2 * border - 1;
cr = gdk_cairo_create (widget->window);
@ -448,8 +448,8 @@ gimp_curve_view_expose (GtkWidget *widget,
cairo_fill (cr);
}
if (view->cursor_x >= 0 && view->cursor_x <= 255 &&
view->cursor_y >= 0 && view->cursor_y <= 255)
if (view->cursor_x >= 0.0 && view->cursor_x <= 1.0 &&
view->cursor_y >= 0.0 && view->cursor_y <= 1.0)
{
gchar buf[32];
gint w, h;
@ -478,7 +478,8 @@ gimp_curve_view_expose (GtkWidget *widget,
cairo_stroke (cr);
g_snprintf (buf, sizeof (buf), "x:%3d y:%3d",
view->cursor_x, 255 - view->cursor_y);
(gint) (view->cursor_x * 255.999),
(gint) ((1.0 - view->cursor_y) * 255.999));
pango_layout_set_text (view->cursor_layout, buf, -1);
gdk_cairo_set_source_color (cr, &style->base[GTK_STATE_NORMAL]);
@ -881,8 +882,8 @@ gimp_curve_view_set_cursor (GimpCurveView *view,
gdouble x,
gdouble y)
{
view->cursor_x = x * 255.999;
view->cursor_y = y * 255.999;
view->cursor_x = x;
view->cursor_y = y;
gtk_widget_queue_draw (GTK_WIDGET (view));
}
@ -890,8 +891,8 @@ gimp_curve_view_set_cursor (GimpCurveView *view,
static void
gimp_curve_view_unset_cursor (GimpCurveView *view)
{
view->cursor_x = -1;
view->cursor_y = -1;
view->cursor_x = -1.0;
view->cursor_y = -1.0;
gtk_widget_queue_draw (GTK_WIDGET (view));
}

4
app/widgets/gimpcurveview.h
View File

@ -55,8 +55,8 @@ struct _GimpCurveView
gdouble xpos;
PangoLayout *xpos_layout;
gint cursor_x;
gint cursor_y;
gdouble cursor_x;
gdouble cursor_y;
PangoLayout *cursor_layout;
PangoRectangle cursor_rect;
};