X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftitler%2Ftitlewindow.C;h=1a537ba67a4bb378d4efd888696ecb3832a9aaed;hb=79ab99f7d6cc503f9d8a9a9618129c9e4d3842c1;hp=17178fc36dd5f271be8a80ec08c4287a14dcd070;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/plugins/titler/titlewindow.C b/cinelerra-5.1/plugins/titler/titlewindow.C index 17178fc3..1a537ba6 100644 --- a/cinelerra-5.1/plugins/titler/titlewindow.C +++ b/cinelerra-5.1/plugins/titler/titlewindow.C @@ -239,32 +239,33 @@ void TitleWindow::create_objects() pitch = new TitlePitch(client, this, x1, y2+10, &client->config.line_pitch); pitch->create_objects(); x = x2 + size_tumbler->get_w() + margin; + int y3 = pitch->get_y() + pitch->get_h(); add_tool(style_title = new BC_Title(x, y, _("Style:"))); add_tool(italic = new TitleItalic(client, this, x, y + 20)); int w1 = italic->get_w(); add_tool(bold = new TitleBold(client, this, x, y + 50)); - if( bold->get_w() > w1 ) w1 = bold->get_w(); + if( bold->get_w() > w1 ) w1 = bold->get_w(); #ifdef USE_OUTLINE add_tool(stroke = new TitleStroke(client, this, x, y + 80)); - if( stroke->get_w() > w1 ) w1 = stroke->get_w(); + if( stroke->get_w() > w1 ) w1 = stroke->get_w(); #endif x += w1 + 10; add_tool(justify_title = new BC_Title(x, y, _("Justify:"))); add_tool(left = new TitleLeft(client, this, x, y + 20)); w1 = left->get_w(); add_tool(center = new TitleCenter(client, this, x, y + 50)); - if( center->get_w() > w1 ) w1 = center->get_w(); + if( center->get_w() > w1 ) w1 = center->get_w(); add_tool(right = new TitleRight(client, this, x, y + 80)); - if( right->get_w() > w1 ) w1 = right->get_w(); + if( right->get_w() > w1 ) w1 = right->get_w(); x += w1 + 10; add_tool(top = new TitleTop(client, this, x, y + 20)); add_tool(mid = new TitleMid(client, this, x, y + 50)); add_tool(bottom= new TitleBottom(client, this, x, y + 80)); - y += 50; x = 10; + y = y3; add_tool(x_title = new BC_Title(x, y, _("X:"))); title_x = new TitleX(client, this, x, y + 20); @@ -385,9 +386,9 @@ int TitleWindow::resize_event(int w, int h) #endif size_title->reposition_window(size_title->get_x(), size_title->get_y()); size->reposition_window(size->get_x(), size->get_y()); - size_tumbler->reposition_window(size_title->get_x(), size_title->get_y()); + size_tumbler->reposition_window(size_tumbler->get_x(), size_tumbler->get_y()); pitch_title->reposition_window(pitch_title->get_x(), pitch_title->get_y()); - pitch->reposition_window(size->get_x(), size->get_y()); + pitch->reposition_window(pitch->get_x(), pitch->get_y()); #ifndef X_HAVE_UTF8_STRING encoding->reposition_window(encoding->get_x(), encoding->get_y());