From 7db14b75024d7e29483d903a6da160fc1fb85932 Mon Sep 17 00:00:00 2001 From: Andrew Randrianasulu Date: Fri, 17 Dec 2021 09:32:14 +0300 Subject: [PATCH 17/24] EXPERIMENTAL: fix layout in bdcreate after tsmuxer checkbox --- cinelerra-5.1/cinelerra/bdcreate.C | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/cinelerra-5.1/cinelerra/bdcreate.C b/cinelerra-5.1/cinelerra/bdcreate.C index b47f80cb..6f4e9675 100644 --- a/cinelerra-5.1/cinelerra/bdcreate.C +++ b/cinelerra-5.1/cinelerra/bdcreate.C @@ -766,7 +766,7 @@ CreateBD_GUI::~CreateBD_GUI() void CreateBD_GUI::create_objects() { int xs10 = xS(10), xs35 = xS(35); - int xs160 = xS(160), xs170 = xS(170); + int xs60 = xS(60), xs160 = xS(160), xs170 = xS(170); int ys5 = yS(5), ys10 = yS(10); lock_window("CreateBD_GUI::create_objects"); int pady = BC_TextBox::calculate_h(this, MEDIUMFONT, 0, 1) + ys5; @@ -805,8 +805,8 @@ void CreateBD_GUI::create_objects() title = new BC_Title(x, y, _("Profile:"), MEDIUMFONT, YELLOW); add_subwindow(title); + int start_x = x; x += title->get_w()+padx; - int prev_title_w = title->get_w()+padx; profile = new CreateBD_Profile(this, x, y); profile->create_objects(); profiles.append(new BC_ListBoxItem("bluray.m2ts")); @@ -815,13 +815,12 @@ void CreateBD_GUI::create_objects() profile->update_list(&profiles); profile->update(profiles[0]->get_text()); - x += title->get_w()+padx; - need_tsmuxer = new CreateBD_UseTsmuxer(this, x1, y); + x += profile->get_w()+padx; + need_tsmuxer = new CreateBD_UseTsmuxer(this, x, y); add_subwindow(need_tsmuxer); + y += need_tsmuxer->get_h() + pady; - y += profile->get_h() + pady; - - title = new BC_Title(x-prev_title_w, y, _("Format:"), MEDIUMFONT, YELLOW); + title = new BC_Title(start_x, y, _("Format:"), MEDIUMFONT, YELLOW); add_subwindow(title); standard = new CreateBD_Format(this, title->get_w() + padx, y); add_subwindow(standard); @@ -836,15 +835,15 @@ void CreateBD_GUI::create_objects() scale->create_objects(); y += standard->get_h() + pady/2; x1 = x; int y1 = y; - need_deinterlace = new CreateBD_Deinterlace(this, x1, y); + need_deinterlace = new CreateBD_Deinterlace(this, start_x, y); add_subwindow(need_deinterlace); y += need_deinterlace->get_h() + pady/2; - need_histogram = new CreateBD_Histogram(this, x1, y); + need_histogram = new CreateBD_Histogram(this, start_x, y); add_subwindow(need_histogram); y += need_histogram->get_h() + pady/2; non_standard = new BC_Title(x1, y+ys5, "", MEDIUMFONT, RED); add_subwindow(non_standard); - x1 += xs160; y = y1; + x1 -= xs60; y = y1; need_inverse_telecine = new CreateBD_InverseTelecine(this, x1, y); add_subwindow(need_inverse_telecine); y += need_inverse_telecine->get_h() + pady/2; -- 2.34.1