X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fsketcher%2Fsketcherwindow.h;h=615852010129ec536df58100387578ada1192d54;hb=505506bd554eff241bd0a5b5b84c220cb2c59971;hp=71c8ac45018b8f1dbf50e9d1ec3d98aefa0cb6ec;hpb=537b18f6fd34e3499123fb25287cd35b28efc491;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/plugins/sketcher/sketcherwindow.h b/cinelerra-5.1/plugins/sketcher/sketcherwindow.h
index 71c8ac45..61585201 100644
--- a/cinelerra-5.1/plugins/sketcher/sketcherwindow.h
+++ b/cinelerra-5.1/plugins/sketcher/sketcherwindow.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __CRIKEYWINDOW_H__
-#define __CRIKEYWINDOW_H__
+#ifndef __SKETCHERWINDOW_H__
+#define __SKETCHERWINDOW_H__
 
 #include "sketcher.h"
 #include "guicast.h"
@@ -33,8 +33,6 @@ class SketcherCurveType;
 class SketcherCurvePenItem;
 class SketcherCurvePen;
 class SketcherCurveColor;
-class SketcherCurveColorPicker;
-class SketcherCurveColorThread;
 class SketcherNewCurve;
 class SketcherDelCurve;
 class SketcherCurveUp;
@@ -98,50 +96,19 @@ public:
 	int pen;
 };
 
-class SketcherCurveColor : public BC_Button
+class SketcherCurveColor : public ColorBoxButton
 {
 public:
-	SketcherCurveColor(SketcherWindow *gui, int x, int y, int w, int h);
+	SketcherCurveColor(SketcherWindow *gui,
+		int x, int y, int w, int h, int color, int alpha);
 	~SketcherCurveColor();
 
-	void set_color(int color);
-	void update_gui(int color);
-	int handle_event();
-
-	int color;
-	VFrame *vframes[3];
-	SketcherWindow *gui;
-};
-
-class SketcherCurveColorPicker : public ColorPicker
-{
-public:
-	SketcherCurveColorPicker(SketcherWindow *gui, SketcherCurveColor *curve_color);
-	~SketcherCurveColorPicker();
-	void start(int color);
 	int handle_new_color(int color, int alpha);
-	void update_gui();
 	void handle_done_event(int result);
 
-	SketcherWindow *gui;
 	int color;
-	SketcherCurveColor *color_button;
-	SketcherCurveColorThread *color_update;
-};
-
-class SketcherCurveColorThread : public Thread
-{
-public:
-	SketcherCurveColorThread(SketcherCurveColorPicker *color_picker);
-	~SketcherCurveColorThread();
-
-	void start();
-	void stop();
-	void run();
-
-	SketcherCurveColorPicker *color_picker;
-	int done;
-	Condition *update_lock;
+	VFrame *vframes[3];
+	SketcherWindow *gui;
 };
 
 class SketcherNewCurve : public BC_GenericButton
@@ -391,7 +358,6 @@ public:
 	void create_objects();
 	void done_event(int result);
 	void update_gui();
-	void start_color_thread(SketcherCurveColor *curve_color);
 	int grab_event(XEvent *event);
 	int do_grab_event(XEvent *event);
 	int grab_button_press(XEvent *event);
@@ -405,7 +371,6 @@ public:
 	SketcherCurveType *curve_type;
 	SketcherCurvePen *curve_pen;
 	SketcherCurveColor *curve_color;
-	SketcherCurveColorPicker *color_picker;
 	SketcherNewCurve *new_curve;
 	SketcherDelCurve *del_curve;
 	SketcherCurveUp *curve_up;
@@ -430,8 +395,9 @@ public:
 	float projector_x, projector_y, projector_z;
 	int track_w, track_h;
 	int new_points;
-	float cursor_x, cursor_y;
+	int cursor_x, cursor_y;
 	float output_x, output_y;
+	float track_x, track_y;
 	int state, dragging;
 	int pending_motion, pending_config;
 	XEvent motion_event;