add focus centroid to masking, mod mask reset/mode btns, add sticky to mask fade...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / cwindowtool.h

diff --git a/cinelerra-5.1/cinelerra/cwindowtool.h b/cinelerra-5.1/cinelerra/cwindowtool.h
index 1eb5002ebb1b39aa22b1b30d304a56fd537ca81f..4691fc0781b41a75fac87e57468bfb6194269fdc 100644 (file)
--- a/cinelerra-5.1/cinelerra/cwindowtool.h
+++ b/cinelerra-5.1/cinelerra/cwindowtool.h
@@ -168,6 +168,8 @@ public:
        char *get_caption() { return 0; }
        MWindow *mwindow;
        CWindowToolGUI *gui;
+       int stick;
+       Timer *timer;
 };
 
 class CWindowMaskMode : public BC_Toggle
@@ -199,6 +201,16 @@ public:
        CWindowToolGUI *gui;
 };
 
+class CWindowMaskFocus : public BC_CheckBox
+{
+public:
+       CWindowMaskFocus(MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+       ~CWindowMaskFocus();
+       int handle_event();
+       MWindow *mwindow;
+       CWindowToolGUI *gui;
+};
+
 class CWindowMaskDelPoint : public BC_GenericButton
 {
 public:
@@ -245,12 +257,11 @@ public:
        CWindowMaskGUI *gui;
 };
 
-class CWindowMaskClrPoint : public BC_Button
+class CWindowMaskClrFeather : public BC_Button
 {
 public:
-       CWindowMaskClrPoint(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y);
-       ~CWindowMaskClrPoint();
-
+       CWindowMaskClrFeather(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y);
+       ~CWindowMaskClrFeather();
        int handle_event();
        MWindow *mwindow;
        CWindowMaskGUI *gui;
@@ -279,6 +290,7 @@ public:
        ~CWindowMaskGUI();
        void create_objects();
        void update();
+       void set_focused(int v, float cx, float cy);
        void handle_event();
        void get_keyframe(Track* &track, MaskAutos* &autos, MaskAuto* &keyframe,
                SubMask* &mask, MaskPoint* &point, int create_it);
@@ -291,9 +303,11 @@ public:
        CWindowMaskFadeSlider *fade_slider;
        CWindowMaskMode *mode;
        CWindowMaskAffectedPoint *active_point;
-       CWindowMaskClrPoint *clr_point;
        CWindowMaskDelPoint *del_point;
        CWindowCoord *x, *y;
+       CWindowMaskFocus *focus;
+       int focused;
+       CWindowCoord *focus_x, *focus_y;
        CWindowMaskFeather *feather;
        CWindowMaskFeatherSlider *feather_slider;
        CWindowMaskBeforePlugins *apply_before_plugins;