add mask color radio btn sel, fix del all mask btn, fix mask dflt kfrm draw name...

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

diff --git a/cinelerra-5.1/cinelerra/cwindowtool.C b/cinelerra-5.1/cinelerra/cwindowtool.C
index ad8aa8d7402baf210192c547b302a7cb5005f26d..2ef53fa9041d13b51f35f4af6b5ddd748775fe12 100644 (file)
--- a/cinelerra-5.1/cinelerra/cwindowtool.C
+++ b/cinelerra-5.1/cinelerra/cwindowtool.C
@@ -1482,8 +1482,8 @@ int CWindowProjectorBottom::handle_event()
 }
 
 
-CWindowMaskName::CWindowMaskName(MWindow *mwindow,
-       CWindowToolGUI *gui, int x, int y, const char *text)
+CWindowMaskName::CWindowMaskName(MWindow *mwindow, CWindowMaskGUI *gui,
+               int x, int y, const char *text)
  : BC_PopupTextBox(gui, 0, text, x, y, 100, 160)
 {
        this->mwindow = mwindow;
@@ -1502,7 +1502,7 @@ int CWindowMaskName::handle_event()
        SubMask *mask;
        MaskPoint *point;
 //printf("CWindowMaskGUI::update 1\n");
-       ((CWindowMaskGUI*)gui)->get_keyframe(track, autos, keyframe, mask, point, 0);
+       gui->get_keyframe(track, autos, keyframe, mask, point, 0);
        if( track ) {
                int k = get_number();
                if( k < 0 ) k = mwindow->edl->session->cwindow_mask;
@@ -1546,6 +1546,63 @@ void CWindowMaskName::update_items(MaskAuto *keyframe)
 }
 
 
+CWindowMaskButton::CWindowMaskButton(MWindow *mwindow, CWindowMaskGUI *gui,
+                int x, int y, int no, int v)
+ : BC_CheckBox(x, y, v)
+{
+       this->mwindow = mwindow;
+       this->gui = gui;
+       this->no = no;
+}
+
+CWindowMaskButton::~CWindowMaskButton()
+{
+}
+
+int CWindowMaskButton::handle_event()
+{
+       mwindow->edl->session->cwindow_mask = no;
+       gui->name->update(gui->name->mask_items[no]->get_text());
+       gui->update();
+       gui->update_preview();
+       return 1;
+}
+
+CWindowMaskThumbler::CWindowMaskThumbler(MWindow *mwindow, CWindowMaskGUI *gui,
+               int x, int y)
+ : BC_Tumbler(x, y)
+{
+       this->mwindow = mwindow;
+       this->gui = gui;
+}
+
+CWindowMaskThumbler::~CWindowMaskThumbler()
+{
+}
+
+int CWindowMaskThumbler::handle_up_event()
+{
+       return do_event(1);
+}
+
+int CWindowMaskThumbler::handle_down_event()
+{
+       return do_event(-1);
+}
+
+int CWindowMaskThumbler::do_event(int dir)
+{
+       int k = mwindow->edl->session->cwindow_mask;
+       if( (k+=dir) >= SUBMASKS ) k = 0;
+       else if( k < 0 ) k = SUBMASKS-1;
+       mwindow->edl->session->cwindow_mask = k;
+       gui->name->update(gui->name->mask_items[k]->get_text());
+       gui->update();
+       gui->update_preview();
+       return 1;
+}
+
+
 CWindowMaskDelMask::CWindowMaskDelMask(MWindow *mwindow,
        CWindowToolGUI *gui, int x, int y)
  : BC_GenericButton(x, y, _("Delete"))
@@ -1709,7 +1766,7 @@ int CWindowMaskAffectedPoint::handle_event()
        int active_point = affected_point;
        if( affected_point >= total_points )
                affected_point = total_points - 1;
-       else if( affected_point < 0 )
+       if( affected_point < 0 )
                affected_point = 0;
        if( active_point != affected_point )
                update((int64_t)affected_point);
@@ -1725,6 +1782,7 @@ CWindowMaskFocus::CWindowMaskFocus(MWindow *mwindow, CWindowToolGUI *gui, int x,
 {
        this->mwindow = mwindow;
        this->gui = gui;
+       set_tooltip("Center for rotate/scale");
 }
 
 CWindowMaskFocus::~CWindowMaskFocus()
@@ -1744,6 +1802,7 @@ CWindowMaskDrawMarkers::CWindowMaskDrawMarkers(MWindow *mwindow, CWindowToolGUI
 {
        this->mwindow = mwindow;
        this->gui = gui;
+       set_tooltip("Display points");
 }
 
 CWindowMaskDrawMarkers::~CWindowMaskDrawMarkers()
@@ -1763,6 +1822,7 @@ CWindowMaskDrawBoundary::CWindowMaskDrawBoundary(MWindow *mwindow, CWindowToolGU
 {
        this->mwindow = mwindow;
        this->gui = gui;
+       set_tooltip("Display mask outline");
 }
 
 CWindowMaskDrawBoundary::~CWindowMaskDrawBoundary()
@@ -2155,7 +2215,7 @@ int CWindowMaskGangFeather::handle_event()
 
 CWindowMaskGUI::CWindowMaskGUI(MWindow *mwindow, CWindowTool *thread)
  : CWindowToolGUI(mwindow, thread,
-       _(PROGRAM_NAME ": Mask"), 360, 440)
+       _(PROGRAM_NAME ": Mask"), 360, 500)
 {
        this->mwindow = mwindow;
        this->thread = thread;
@@ -2194,10 +2254,32 @@ void CWindowMaskGUI::create_objects()
        add_subwindow(clr_mask = new CWindowMaskClrMask(mwindow, this, clr_x, y));
        add_subwindow(del_mask = new CWindowMaskDelMask(mwindow, this, del_x, y));
        y += name->get_h() + margin;
+
+       int bw = 0, bh = 0;
+       BC_CheckBox::calculate_extents(this, &bw, &bh);
+       int bdx = bw + margin;
+       int x2 = x;
+       for( int i=0; i<SUBMASKS; x2+=bdx, ++i ) {
+               int v = i == mwindow->edl->session->cwindow_mask ? 1 : 0;
+               mask_buttons[i] = new CWindowMaskButton(mwindow, this, x2, y, i, v);
+               add_subwindow(mask_buttons[i]);
+       }
+       x2 += margin;
+       add_subwindow(mask_thumbler = new CWindowMaskThumbler(mwindow, this, x2, y));
+       y += bh + margin;
+       x2 = x;
+       for( int i=0; i<SUBMASKS; x2+=bdx, ++i ) {
+               char text[BCSTRLEN];  sprintf(text, "%d", i);
+               int tx = (bw - get_text_width(MEDIUMFONT, text)) / 2;
+               mask_blabels[i] = new BC_Title(x2+tx, y, text);
+               add_subwindow(mask_blabels[i]);
+       }
+       y += bh + 2*margin;
+
        add_subwindow(title = new BC_Title(x, y, _("Fade:")));
        fade = new CWindowMaskFade(mwindow, this, x1, y);
        fade->create_objects();
-       int x2 = x1 + fade->get_w() + 2*margin;
+       x2 = x1 + fade->get_w() + 2*margin;
        int w2 = clr_x-2*margin - x2;
        add_subwindow(fade_slider = new CWindowMaskFadeSlider(mwindow, this, x2, y, w2));
        add_subwindow(gang_fader = new CWindowMaskGangFader(mwindow, this, clr_x, y));
@@ -2317,6 +2399,7 @@ void CWindowMaskGUI::update()
 
                if(mask) {
                        int k = mwindow->edl->session->cwindow_mask;
+                       update_buttons(keyframe, k);
                        feather->update(autos->get_feather(position_i, k, PLAY_FORWARD));
                        fade->update(autos->get_fader(position_i, k, PLAY_FORWARD));
                        apply_before_plugins->update(keyframe->apply_before_plugins);
@@ -2394,12 +2477,24 @@ void CWindowMaskGUI::set_focused(int v, float cx, float cy)
        focus->update(focused = v);
 }
 
+void CWindowMaskGUI::update_buttons(MaskAuto *keyframe, int k)
+{
+       int text_color = get_resources()->default_text_color;
+       int high_color = get_resources()->button_highlighted;
+       for( int i=0; i<SUBMASKS; ++i ) {
+               int color = text_color;
+               if( keyframe ) {
+                       SubMask *submask = keyframe->get_submask(i);
+                       if( submask && submask->points.size() )
+                               color = high_color;
+               }
+               mask_blabels[i]->set_color(color);
+               mask_buttons[i]->update(i==k ? 1 : 0);
+       }
+}
+
 CWindowRulerGUI::CWindowRulerGUI(MWindow *mwindow, CWindowTool *thread)
- : CWindowToolGUI(mwindow,
-       thread,
-       _(PROGRAM_NAME ": Ruler"),
-       320,
-       240)
+ : CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Ruler"), 320, 240)
 {
 }