From 3a6c2c4d94e7b24eb50d8ecd3ec0b3c8d8539743 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Wed, 26 Sep 2018 19:46:55 -0600 Subject: [PATCH] repair a/v patchgui widget placement --- cinelerra-5.1/cinelerra/apatchgui.C | 9 +++------ cinelerra-5.1/cinelerra/vpatchgui.C | 6 ++---- 2 files changed, 5 insertions(+), 10 deletions(-) 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; } -- 2.26.2