fix default color btn in set title bar color, fix bar color fast path, tweaks to...

diff --git a/cinelerra-5.1/cinelerra/colorpicker.C b/cinelerra-5.1/cinelerra/colorpicker.C
index 26451d7086a68bf2ef968efe6e71113f8d4d6ac1..7c0a38d0d946fa8364b5e0c84c25ed442d2110e2 100644 (file)
--- a/cinelerra-5.1/cinelerra/colorpicker.C
+++ b/cinelerra-5.1/cinelerra/colorpicker.C
@@ -86,6 +86,7 @@ BC_Window* ColorPicker::new_gui()
        if( x < 0 ) x = 0;
        if( y < 0 ) y = 0;
        ColorWindow *window = new ColorWindow(this, x, y, w, h, window_title);
+       window->create_objects();
        window->start_selection(color, !do_alpha ? -1 : alpha, ok_cancel);
        return window;
 }
@@ -114,6 +115,13 @@ ColorWindow::~ColorWindow()
 {
 }
 
+void ColorWindow::create_objects()
+{
+       BC_WindowBase::create_objects();
+       ColorGUI::create_objects();
+       thread->create_objects(this);
+}
+
 void ColorWindow::update_gui(int color, int alpha)
 {
        lock_window("ColorWindow::update_gui");

diff --git a/cinelerra-5.1/cinelerra/colorpicker.h b/cinelerra-5.1/cinelerra/colorpicker.h
index 706b279249dbcf0f53ee261b0655c4446f389c0b..9116e0d61a4a4eccf37ef838f310951a90fbe6c1 100644 (file)
--- a/cinelerra-5.1/cinelerra/colorpicker.h
+++ b/cinelerra-5.1/cinelerra/colorpicker.h
@@ -45,6 +45,7 @@ public:
        ColorPicker(int do_alpha = 0, const char *title = 0);
        ~ColorPicker();
        void start_window(int color, int alpha, int ok_cancel=0);
+       virtual void create_objects(ColorWindow *window) {}
        virtual void update_gui(int color, int alpha);
        virtual int handle_new_color(int color, int alpha);
        BC_Window* new_gui();
@@ -142,6 +143,7 @@ public:
 
        void update_gui(int color, int alpha);
        int handle_new_color(int color, int alpha);
+       void create_objects();
 
        int close_event() { return close_gui(); }
        int cursor_motion_event() { return cursor_motion_gui(); }

diff --git a/cinelerra-5.1/cinelerra/resourcepixmap.C b/cinelerra-5.1/cinelerra/resourcepixmap.C
index 9ed12d9357dc71fdef5f83de4f277ec43e408f33..b0bc49b7ffbf5020ce8764ac5024ff1ddccbe763 100644 (file)
--- a/cinelerra-5.1/cinelerra/resourcepixmap.C
+++ b/cinelerra-5.1/cinelerra/resourcepixmap.C
@@ -238,6 +238,8 @@ VFrame *ResourcePixmap::change_title_color(VFrame *title_bg, int color)
        VFrame *title_bar = new VFrame(tw, th, colormodel);
        uint8_t **bar_rows = title_bar->get_rows();
        const uint8_t gap_grey = 0x4a;
+       union { unsigned rgba; struct { uint8_t r,g,b,a; }; } c;
+       c.r = color>>16;  c.g = color>>8;  c.b = color>>0;  c.a = 0xff;
        if( BC_CModels::has_alpha(colormodel) && // fast path
            BC_CModels::calculate_pixelsize(colormodel) == sizeof(unsigned) ) {
                const unsigned gap_rgba = (0xff<<24) |
@@ -246,16 +248,14 @@ VFrame *ResourcePixmap::change_title_color(VFrame *title_bg, int color)
                        unsigned *bp = (unsigned *)bar_rows[0];
                        for( int i=tw; --i>=0; ) *bp++ = gap_rgba;
                }
-               unsigned rgba = (0xff<<24) | (color & 0xffffff);
                for( int y=1; y<th; ++y ) {
                        unsigned *bp = (unsigned *)bar_rows[y];
                        if( tw > 0 ) *bp++ = gap_rgba;
-                       for( int i=tw1; --i>0; ++bp ) *bp = rgba;
+                       for( int i=tw1; --i>0; ++bp ) *bp = c.rgba;
                        if( tw > 1 ) *bp = gap_rgba;
                }
        }
        else {
-               uint8_t cr = (color>>16), cg = (color>>8), cb = (color>>0);
                if( th > 0 ) {
                        uint8_t *cp = bar_rows[0];
                        for( int x=0; x<tw; ++x ) {
@@ -272,7 +272,7 @@ VFrame *ResourcePixmap::change_title_color(VFrame *title_bg, int color)
                                cp += bpp;
                        }
                        for( int x=1; x<tw1; ++x ) {
-                               cp[0] = cr; cp[1] = cg; cp[2] = cb;
+                               cp[0] = c.r; cp[1] = c.g; cp[2] = c.b;
                                if( bpp > 3 ) cp[3] = 0xff;
                                cp += bpp;
                        }

diff --git a/cinelerra-5.1/cinelerra/trackpopup.C b/cinelerra-5.1/cinelerra/trackpopup.C
index 224343b42677b44d3718d8d98c6a5f41f3f4f241..c00c023d39ce25389bbc96aed2bdbd61d75d44b3 100644 (file)
--- a/cinelerra-5.1/cinelerra/trackpopup.C
+++ b/cinelerra-5.1/cinelerra/trackpopup.C
@@ -454,10 +454,12 @@ TrackTitleColorPicker::~TrackTitleColorPicker()
 }
 void TrackTitleColorPicker::create_objects(ColorWindow *gui)
 {
+       gui->lock_window("TrackTitleColorPicker::create_objects");
        int y = gui->get_h() - BC_CancelButton::calculate_h() + yS(10);
        int x = gui->get_w() - BC_CancelButton::calculate_w() - xS(10);
        x -= BC_GenericButton::calculate_w(gui, _("default")) + xS(15);
        gui->add_subwindow(new TrackTitleColorDefault(this, x, y));
+       gui->unlock_window();
 }
 
 int TrackTitleColorPicker::handle_new_color(int color, int alpha)

diff --git a/cinelerra-5.1/plugins/sketcher/sketcherwindow.C b/cinelerra-5.1/plugins/sketcher/sketcherwindow.C
index 5a38b4b81438a82c2d6b78084055da0e9972e9b9..dfb7e956b6dfef1d044bd38b7da7943f90862902 100644 (file)
--- a/cinelerra-5.1/plugins/sketcher/sketcherwindow.C
+++ b/cinelerra-5.1/plugins/sketcher/sketcherwindow.C
@@ -278,6 +278,7 @@ SketcherAliasing::SketcherAliasing(SketcherWindow *gui, Sketcher *plugin,
 {
        this->gui = gui;
        this->plugin = plugin;
+       set_tooltip(_("Anti-Aliasing"));
 }
 SketcherAliasing::~SketcherAliasing()
 {
@@ -293,7 +294,7 @@ void SketcherAliasing::create_objects()
 const char *SketcherAliasing::alias_to_text(int alias)
 {
        if( alias < 0 ) return _("Off");
-       if( alias > 0 ) return _("Dbl");
+       if( alias > 0 ) return _("Double");
        return _("On");
 }