X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fvicon.C;h=f27791f94c06767bd12f0fc318093e2842319685;hp=89b8eb244eab558c659d1c2f3bf0b27a51caf607;hb=cb1a1530246ad67fb9be9aa2dbba5b88eb63e933;hpb=8a2d79c16c6793d7d3483e9a74205569228ca0cc

diff --git a/cinelerra-5.1/guicast/vicon.C b/cinelerra-5.1/guicast/vicon.C
index 89b8eb24..f27791f9 100644
--- a/cinelerra-5.1/guicast/vicon.C
+++ b/cinelerra-5.1/guicast/vicon.C
@@ -213,23 +213,13 @@ ViewPopup *VIconThread::new_view_window()
 	int vx = viewing->get_vx(), rx = 0;
 	int vy = viewing->get_vy(), ry = 0;
 	wdw->get_root_coordinates(vx, vy, &rx, &ry);
-	rx += (rx >= cx ? -view_w : viewing->w);
-	ry += (ry >= cy ? -view_h : viewing->h);
+	rx += (rx >= cx ? -view_w+viewing->w/4 : viewing->w-viewing->w/4);
+	ry += (ry >= cy ? -view_h+viewing->h/4 : viewing->h-viewing->h/4);
 	ViewPopup *vwin = new ViewPopup(this, rx, ry, view_w, view_h);
 	wdw->set_active_subwindow(vwin);
 	return vwin;
 }
 
-int ViewPopup::zoom_scale(int dir)
-{
-	int view_h = vt->view_h + dir*vt->view_h/10 + dir;
-	bclamp(view_h, 16,512);
-	vt->view_h = view_h;
-	vt->view_w = view_h * vt->vw/vt->vh;
-	vt->stop_viewing();
-	return 1;
-}
-
 
 void VIconThread::
 reset_images()
@@ -289,6 +279,17 @@ update_view()
 	return 1;
 }
 
+int VIconThread::zoom_scale(int dir)
+{
+	int view_h = this->view_h;
+	view_h += dir*view_h/10 + dir;
+	bclamp(view_h, 16,512);
+	this->view_h = view_h;
+	this->view_w = view_h * vw/vh;
+	stop_viewing();
+	return 1;
+}
+
 
 void VIconThread::
 draw_images()