From: Good Guy <good1.2guy@gmail.com>
Date: Thu, 27 Sep 2018 01:46:55 +0000 (-0600)
Subject: repair a/v patchgui widget placement
X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=3a6c2c4d94e7b24eb50d8ecd3ec0b3c8d8539743;p=goodguy%2Fhistory.git

repair a/v patchgui widget placement
---

diff --git a/cinelerra-5.1/cinelerra/apatchgui.C b/cinelerra-5.1/cinelerra/apatchgui.C
index f41959ac..abfe57cd 100644
--- a/cinelerra-5.1/cinelerra/apatchgui.C
+++ b/cinelerra-5.1/cinelerra/apatchgui.C
@@ -115,8 +115,7 @@ int APatchGUI::update(int x, int y)
 		patchbay->add_subwindow(fade = new AFadePatch(mwindow, this, x1+x, y1+y,
 			patchbay->get_w() - 10));
 	}
-	if( fade )
-		y1 = y2;
+	y1 = y2;
 
 	y2 = y1 + mwindow->theme->meter_h;
 	if( meter ) {
@@ -127,8 +126,7 @@ int APatchGUI::update(int x, int y)
 	else if( h >= y2 ) {
 		patchbay->add_subwindow(meter = new AMeterPatch(mwindow, this, x1+x, y1+y));
 	}
-	if( meter )
-		y1 = y2;
+	y1 = y2;
 
 	y2 = y1 + mwindow->theme->pan_h;
 	if( pan ) {
@@ -168,8 +166,7 @@ int APatchGUI::update(int x, int y)
 		patchbay->add_subwindow(nudge = new NudgePatch(mwindow, this, x1+x, y1+y,
 				patchbay->get_w() - x1-x - 10));
 	}
-	if( pan )
-		y1 = y2;
+	y1 = y2;
 
 	return y1;
 }
diff --git a/cinelerra-5.1/cinelerra/vpatchgui.C b/cinelerra-5.1/cinelerra/vpatchgui.C
index 2d01e014..1095238f 100644
--- a/cinelerra-5.1/cinelerra/vpatchgui.C
+++ b/cinelerra-5.1/cinelerra/vpatchgui.C
@@ -104,8 +104,7 @@ int VPatchGUI::update(int x, int y)
 		patchbay->add_subwindow(fade = new VFadePatch(mwindow, this, x1+x, y1+y,
 			patchbay->get_w() - 10));
 	}
-	if( fade )
-		y1 = y2;
+	y1 = y2;
 
 	y2 = y1 + mwindow->theme->mode_h;
 	if( mode ) {
@@ -132,8 +131,7 @@ int VPatchGUI::update(int x, int y)
 		patchbay->add_subwindow(nudge = new NudgePatch(mwindow, this, x1+x, y1+y,
 			patchbay->get_w() - x1-x - 10));
 	}
-	if( mode )
-		y1 = y2;
+	y1 = y2;
 
 	return y1;
 }