X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fshapewipe%2Fshapewipe.C;h=ca675e2d14fc2107d561e8877f6d581073b39fe8;hb=refs%2Ftags%2F2020-01;hp=7920b622a395c1a4f37aec4f34a6cf81fe64d1a0;hpb=72a88d4704507f72e05b380d9604d9eb3e7d5a89;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/plugins/shapewipe/shapewipe.C b/cinelerra-5.1/plugins/shapewipe/shapewipe.C
index 7920b622..ca675e2d 100644
--- a/cinelerra-5.1/plugins/shapewipe/shapewipe.C
+++ b/cinelerra-5.1/plugins/shapewipe/shapewipe.C
@@ -164,7 +164,7 @@ ShapeWipeFeather::ShapeWipeFeather(ShapeWipeMain *client,
 		ShapeWipeWindow *window, int x, int y)
  : BC_TumbleTextBox(window,
 		bclip(client->config.feather, SHAPE_FMIN, SHAPE_FMAX),
-		SHAPE_FMIN, SHAPE_FMAX, x, y, 64, 3)
+		SHAPE_FMIN, SHAPE_FMAX, x, y, xS(64), yS(3))
 {
 	this->client = client;
 	this->window = window;
@@ -241,7 +241,7 @@ int ShapeWipeShape::handle_event()
 
 
 ShapeWipeWindow::ShapeWipeWindow(ShapeWipeMain *plugin)
- : PluginClientWindow(plugin, 425, 215, 425, 215, 0)
+ : PluginClientWindow(plugin, xS(425), yS(215), xS(425), yS(215), 0)
 {
 	this->plugin = plugin;
 	shape_feather = 0;
@@ -258,7 +258,7 @@ void ShapeWipeWindow::create_objects()
 {
 	BC_Title *title = 0;
 	lock_window("ShapeWipeWindow::create_objects");
-	int pad = 10, margin = 10;
+	int pad = xS(10), margin = xS(10);
 	int x = margin, y = margin;
 	int ww = get_w() - 2*margin;
 
@@ -268,13 +268,13 @@ void ShapeWipeWindow::create_objects()
 	}
 
 	BC_TitleBar *bar;
-	add_subwindow(bar = new BC_TitleBar(x, y, ww, x+ww/12,
-		pad, _("Wipe"), MEDIUMFONT));
+	add_subwindow(bar = new BC_TitleBar(x, y, ww, xS(20), yS(10),
+		_("Wipe"), MEDIUMFONT));
 	y += bar->get_h() + pad;
 
 	add_subwindow(title = new BC_Title(x, y, _("Shape:")));
-	int x1 = 85, x2 = 355, x3 = 386;
-	shape_text = new ShapeWipeShape(plugin, this, x1, y, x2-x1, 200);
+	int x1 = xS(85), x2 = xS(355), x3 = xS(386);
+	shape_text = new ShapeWipeShape(plugin, this, x1, y, x2-x1, yS(200));
 	shape_text->create_objects();
 	add_subwindow(new ShapeWipeTumble(plugin, this, x3, y));
 	y += shape_text->get_h() + pad;
@@ -296,8 +296,8 @@ void ShapeWipeWindow::create_objects()
 		plugin, this, x, y));
 	y += aspect_ratio->get_h() + pad;
 
-	add_subwindow(bar = new BC_TitleBar(x, y, ww, x+ww/12,
-		pad, _("Direction"), MEDIUMFONT));
+	add_subwindow(bar = new BC_TitleBar(x, y, ww, xS(20), yS(10),
+		_("Direction"), MEDIUMFONT));
 	y += bar->get_h() + pad;
 	x = margin;
 	add_subwindow(left = new ShapeWipeW2B(plugin, this, x, y));