X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowtool.h;h=92fa72b9e6251fe01c899148a184624e2d9b7906;hp=0e6b1a705921907a202fde4fc6a81f369a1a1103;hb=a19a685a46ddc630010788707d9e5b9d2342af46;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd

diff --git a/cinelerra-5.1/cinelerra/cwindowtool.h b/cinelerra-5.1/cinelerra/cwindowtool.h
index 0e6b1a70..92fa72b9 100644
--- a/cinelerra-5.1/cinelerra/cwindowtool.h
+++ b/cinelerra-5.1/cinelerra/cwindowtool.h
@@ -178,6 +178,18 @@ public:
 	CWindowToolGUI *gui;
 };
 
+
+class CWindowMaskAffectedPoint : public BC_TumbleTextBox
+{
+public:
+	CWindowMaskAffectedPoint(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+	~CWindowMaskAffectedPoint();
+	int handle_event();
+	MWindow *mwindow;
+	CWindowToolGUI *gui;
+};
+
+
 class CWindowMaskFeather : public BC_TumbleTextBox
 {
 public:
@@ -206,8 +218,13 @@ public:
 	CWindowToolGUI *gui;
 };
 
-
-
+class CWindowDisableOpenGLMasking : public BC_CheckBox
+{
+public:
+	CWindowDisableOpenGLMasking(CWindowToolGUI *gui, int x, int y);
+	int handle_event();
+	CWindowToolGUI *gui;
+};
 
 class CWindowMaskGUI : public CWindowToolGUI
 {
@@ -225,16 +242,18 @@ public:
 	CWindowMaskMode *mode;
 	CWindowMaskFeather *feather;
 	CWindowMaskDelete *delete_point;
+	CWindowMaskAffectedPoint *active_point;
 // Not necessary if all keyframes have same points
 //	CWindowMaskCycleNext *next_point;
 //	CWindowMaskCyclePrev *prev_point;
 	CWindowMaskNumber *number;
 	CWindowMaskValue *value;
 	CWindowMaskBeforePlugins *apply_before_plugins;
+	CWindowDisableOpenGLMasking *disable_opengl_masking;
 };
 
 
-
+class CWindowEyedropCheckBox;
 class CWindowEyedropGUI : public CWindowToolGUI
 {
 public:
@@ -245,12 +264,29 @@ public:
 	void create_objects();
 	void update();
 
+	BC_Title *current;
 	CWindowCoord *radius;
+	CWindowEyedropCheckBox *use_max;
 	BC_Title *red, *green, *blue, *y, *u, *v;
+	BC_Title *rgb_hex, *yuv_hex;
 	BC_SubWindow *sample;
 };
 
 
+class CWindowEyedropCheckBox : public BC_CheckBox
+{
+public:
+	CWindowEyedropCheckBox(MWindow *mwindow, 
+		CWindowEyedropGUI *gui,
+		int x, 
+		int y);
+
+	int handle_event();
+	MWindow *mwindow;
+	CWindowEyedropGUI *gui;
+};
+
+
 
 class CWindowCameraGUI : public CWindowToolGUI
 {
@@ -407,11 +443,12 @@ public:
 // Update the gui
 	void handle_event();
 
-	BC_Title *current;
-	BC_Title *point1;
-	BC_Title *point2;
-	BC_Title *distance;
-	BC_Title *angle;
+	BC_TextBox *current;
+	BC_TextBox *point1;
+	BC_TextBox *point2;
+	BC_TextBox *deltas;
+	BC_TextBox *distance;
+	BC_TextBox *angle;
 };