X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fboxblur%2Fboxblur.C;h=7c8fb1e96f5fc531c761d0699764c545bc5754e2;hb=f46839d462b640dd0542b2d87c7ab03e72a72613;hp=4c9affc621c338aef0c6d61ab75af0023d2e5d44;hpb=6f73adad624d1ca2b397791784d0c778fcce8d39;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/plugins/boxblur/boxblur.C b/cinelerra-5.1/plugins/boxblur/boxblur.C
index 4c9affc6..7c8fb1e9 100644
--- a/cinelerra-5.1/plugins/boxblur/boxblur.C
+++ b/cinelerra-5.1/plugins/boxblur/boxblur.C
@@ -291,12 +291,12 @@ void BoxBlurConfig::interpolate(BoxBlurConfig &prev, BoxBlurConfig &next,
 	double v = 1. - u;
 	this->horz_radius = u*prev.horz_radius + v*next.horz_radius;
 	this->vert_radius = u*prev.vert_radius + v*next.vert_radius;
-	this->power = u*prev.power + v*next.power;
+	this->power = u*prev.power + v*next.power + 1e-6; // avoid truncation jitter
 	this->drag = prev.drag;
 	this->box_x = u*prev.box_x + v*next.box_x;
 	this->box_y = u*prev.box_y + v*next.box_y;
-	this->box_w = u*prev.box_w + v*next.box_w;
-	this->box_h = u*prev.box_h + v*next.box_h;
+	this->box_w = u*prev.box_w + v*next.box_w + 1e-6;
+	this->box_h = u*prev.box_h + v*next.box_h + 1e-6;
 }
 
 
@@ -314,6 +314,7 @@ int BoxBlurNumISlider::handle_event()
 {
 	int iv = get_value();
 	num->update(iv);
+	num->gui->update_drag();
 	return 1;
 }
 
@@ -328,6 +329,7 @@ int BoxBlurNumIText::handle_event()
 {
 	int iv = atoi(get_text());
 	num->update(iv);
+	num->gui->update_drag();
 	return 1;
 }
 
@@ -347,6 +349,7 @@ int BoxBlurNumClear::handle_event()
 {
 	int v = num->imn;
 	num->update(v);
+	num->gui->update_drag();
 	return 1;
 }
 
@@ -402,7 +405,6 @@ void BoxBlurNum::update(int value)
 	text->update((int64_t)value);
 	slider->update(value);
 	*ivalue = value;
-	gui->update_drag();
 }
 
 
@@ -419,7 +421,7 @@ BoxBlurPower::BoxBlurPower(BoxBlurWindow *gui, int x, int y, int w,
 }
 
 BoxBlurWindow::BoxBlurWindow(BoxBlurEffect *plugin)
- : PluginClientWindow(plugin, xS(360), yS(246), xS(360), yS(246), 0)
+ : PluginClientWindow(plugin, xS(360), yS(260), xS(360), yS(260), 0)
 {
 	this->plugin = plugin;
 	blur_horz = 0;
@@ -443,13 +445,14 @@ BoxBlurWindow::~BoxBlurWindow()
 void BoxBlurWindow::create_objects()
 {
 	int x = xS(10), y = yS(10);
+	int ys10 = yS(10), ys20 = yS(20), ys30 = yS(30), ys40 = yS(40);
 	int t1 = x, t2 = t1+xS(24), t3 = t2+xS(100), t4 = t3+xS(24);
 	int ww = get_w() - 2*x, bar_o = xS(30), bar_m = xS(15);
 	int margin = plugin->get_theme()->widget_border;
 
-        BC_TitleBar *tbar;
-        add_subwindow(tbar = new BC_TitleBar(x, y, ww, bar_o, bar_m, _("Position & Size")));
-        y += tbar->get_h() + margin;
+	BC_TitleBar *tbar;
+	add_subwindow(tbar = new BC_TitleBar(x, y, ww, bar_o, bar_m, _("Position & Size")));
+	y += ys20;
 	int x1 = ww - BoxBlurDrag::calculate_w(this) - margin;
 	add_subwindow(drag = new BoxBlurDrag(this, plugin, x1, y));
 	drag->create_objects();
@@ -463,32 +466,32 @@ void BoxBlurWindow::create_objects()
 	add_subwindow(title = new BC_Title(t3, y, _("W:")));
 	box_w = new BoxBlurW(this, t4, y);
 	box_w->create_objects();
-	y += bmax(title->get_h(), box_w->get_h()) + margin;
+	y += ys30;
 	add_subwindow(title = new BC_Title(t1, y, _("Y:")));
 	box_y = new BoxBlurY(this, t2, y);
 	box_y->create_objects();
 	add_subwindow(title = new BC_Title(t3, y, _("H:")));
 	box_h = new BoxBlurH(this, t4, y);
 	box_h->create_objects();
-	y += bmax(title->get_h(), box_h->get_h()) + 2*margin;
+	y += ys40;
 
 	add_subwindow(tbar = new BC_TitleBar(x, y, ww, bar_o, bar_m, _("Blur")));
-	y += tbar->get_h() + margin;
+	y += ys20;
 	blur_horz = new BoxBlurRadius(this, x, y, ww, _("Horz:"),
 			&plugin->config.horz_radius);
 	blur_horz->create_objects();
-	y += blur_horz->get_h() + margin;
+	y += ys30;
 	blur_vert = new BoxBlurRadius(this, x, y, ww, _("Vert:"),
 			&plugin->config.vert_radius);
 	blur_vert->create_objects();
-	y += blur_vert->get_h() + margin;
+	y += ys30;
 	blur_power = new BoxBlurPower(this, x, y, ww, _("Power:"),
 			&plugin->config.power);
 	blur_power->create_objects();
-	y += blur_power->get_h() + margin + yS(8);
+	y += ys40;
 	BC_Bar *bar;
 	add_subwindow(bar = new BC_Bar(x, y, ww));
-	y += bar->get_h() + 2*margin;
+	y += ys10;
 
 	add_subwindow(reset = new BoxBlurReset(this, x, y));
 	x1 = x + ww - BoxBlurPreset::calculate_w(this);