X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Foverlay%2Foverlay.C;h=ae9087815b7a664b7b592602f7e14bc95dcac9da;hb=5ec378f09aeeb646705fdb8035b39a186374fba0;hp=a77898f37ce988a53b89c0b452922bfd45681062;hpb=592d502d68e409919fb36a31ba60c23f57b00f35;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/plugins/overlay/overlay.C b/cinelerra-5.1/plugins/overlay/overlay.C index a77898f3..ae908781 100644 --- a/cinelerra-5.1/plugins/overlay/overlay.C +++ b/cinelerra-5.1/plugins/overlay/overlay.C @@ -183,12 +183,7 @@ const char* OverlayConfig::output_to_text(int output_layer) OverlayWindow::OverlayWindow(Overlay *plugin) - : PluginClientWindow(plugin, - 300, - 160, - 300, - 160, - 0) + : PluginClientWindow(plugin, xS(300), yS(100), xS(300), yS(100), 0) { this->plugin = plugin; } @@ -199,26 +194,28 @@ OverlayWindow::~OverlayWindow() void OverlayWindow::create_objects() { - int x = 10, y = 10; + int xs5 = xS(5), xs10 = xS(10); + int ys10 = yS(10), ys30 = yS(30); + int x = xs10, y = ys10; BC_Title *title; add_subwindow(title = new BC_Title(x, y, _("Mode:"))); add_subwindow(mode = new OverlayMode(plugin, - x + title->get_w() + 5, + x + title->get_w() + xs5, y)); mode->create_objects(); - y += 30; + y += ys30; add_subwindow(title = new BC_Title(x, y, _("Layer order:"))); add_subwindow(direction = new OverlayDirection(plugin, - x + title->get_w() + 5, + x + title->get_w() + xs5, y)); direction->create_objects(); - y += 30; + y += ys30; add_subwindow(title = new BC_Title(x, y, _("Output layer:"))); add_subwindow(output = new OverlayOutput(plugin, - x + title->get_w() + 5, + x + title->get_w() + xs5, y)); output->create_objects(); @@ -233,7 +230,7 @@ void OverlayWindow::create_objects() OverlayMode::OverlayMode(Overlay *plugin, int x, int y) - : BC_PopupMenu(x, y, 150, + : BC_PopupMenu(x, y, xS(150), OverlayConfig::mode_to_text(plugin->config.mode), 1) { this->plugin = plugin; @@ -266,9 +263,7 @@ int OverlayMode::handle_event() OverlayDirection::OverlayDirection(Overlay *plugin, int x, int y) - : BC_PopupMenu(x, - y, - 150, + : BC_PopupMenu(x, y, xS(150), OverlayConfig::direction_to_text(plugin->config.direction), 1) { @@ -307,9 +302,7 @@ int OverlayDirection::handle_event() OverlayOutput::OverlayOutput(Overlay *plugin, int x, int y) - : BC_PopupMenu(x, - y, - 100, + : BC_PopupMenu(x, y, xS(100), OverlayConfig::output_to_text(plugin->config.output_layer), 1) {