[gimp/gtk3-port: 23/451] app: port to GtkWidget::draw() and s/GtkObject/GtkAdjustment/
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 23/451] app: port to GtkWidget::draw() and s/GtkObject/GtkAdjustment/
- Date: Wed, 16 May 2018 01:06:11 +0000 (UTC)
commit aa7bf61c4caff6e43f99ddb4a78deaab8c120c62
Author: Michael Natterer <mitch gimp org>
Date: Fri Oct 15 14:19:42 2010 +0200
app: port to GtkWidget::draw() and s/GtkObject/GtkAdjustment/
app/widgets/gimpgradienteditor.c | 52 +++++++++++++++++--------------------
1 files changed, 24 insertions(+), 28 deletions(-)
---
diff --git a/app/widgets/gimpgradienteditor.c b/app/widgets/gimpgradienteditor.c
index 0d4ccd4..b047e8b 100644
--- a/app/widgets/gimpgradienteditor.c
+++ b/app/widgets/gimpgradienteditor.c
@@ -161,8 +161,8 @@ static void view_pick_color (GimpGradientEditor *editor,
static gboolean control_events (GtkWidget *widget,
GdkEvent *event,
GimpGradientEditor *editor);
-static gboolean control_expose (GtkWidget *widget,
- GdkEventExpose *event,
+static gboolean control_draw (GtkWidget *widget,
+ cairo_t *cr,
GimpGradientEditor *editor);
static void control_do_hint (GimpGradientEditor *editor,
gint x,
@@ -203,7 +203,7 @@ static double control_move (GimpGradientEditor *editor,
static void control_update (GimpGradientEditor *editor,
GimpGradient *gradient,
gboolean recalculate);
-static void control_draw (GimpGradientEditor *editor,
+static void control_draw_all (GimpGradientEditor *editor,
GimpGradient *gradient,
cairo_t *cr,
gint width,
@@ -354,8 +354,8 @@ gimp_gradient_editor_init (GimpGradientEditor *editor)
G_CALLBACK (control_events),
editor);
- g_signal_connect (editor->control, "expose-event",
- G_CALLBACK (control_expose),
+ g_signal_connect (editor->control, "draw",
+ G_CALLBACK (control_draw),
editor);
gimp_dnd_color_dest_add (GTK_WIDGET (editor->control),
@@ -1080,8 +1080,7 @@ control_events (GtkWidget *widget,
else
{
GtkAdjustment *adj = editor->scroll_data;
-
- gfloat new_value;
+ gfloat new_value;
new_value = (gtk_adjustment_get_value (adj) +
((sevent->direction == GDK_SCROLL_UP) ?
@@ -1182,26 +1181,23 @@ control_events (GtkWidget *widget,
}
static gboolean
-control_expose (GtkWidget *widget,
- GdkEventExpose *event,
- GimpGradientEditor *editor)
+control_draw (GtkWidget *widget,
+ cairo_t *cr,
+ GimpGradientEditor *editor)
{
GtkAdjustment *adj = editor->scroll_data;
- cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
GtkAllocation allocation;
gtk_widget_get_allocation (widget, &allocation);
- control_draw (editor,
- GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data),
- cr,
- allocation.width,
- allocation.height,
- gtk_adjustment_get_value (adj),
- gtk_adjustment_get_value (adj) +
- gtk_adjustment_get_page_size (adj));
-
- cairo_destroy (cr);
+ control_draw_all (editor,
+ GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data),
+ cr,
+ allocation.width,
+ allocation.height,
+ gtk_adjustment_get_value (adj),
+ gtk_adjustment_get_value (adj) +
+ gtk_adjustment_get_page_size (adj));
return TRUE;
}
@@ -1692,13 +1688,13 @@ control_update (GimpGradientEditor *editor,
}
static void
-control_draw (GimpGradientEditor *editor,
- GimpGradient *gradient,
- cairo_t *cr,
- gint width,
- gint height,
- gdouble left,
- gdouble right)
+control_draw_all (GimpGradientEditor *editor,
+ GimpGradient *gradient,
+ cairo_t *cr,
+ gint width,
+ gint height,
+ gdouble left,
+ gdouble right)
{
GtkStyle *control_style;
GimpGradientSegment *seg;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]