X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fpolar%2Fpolar.C;h=417afc71d0c71f7f6c9f23dba9a27e82502f4b4d;hb=fb3e53778e49a406768506de9bf8edfd3d4c36e6;hp=1681284363deb8545c4ee20111ea8bde4de25722;hpb=c905fabd0678fcc8ab9e32e4443ad8709adafefd;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/plugins/polar/polar.C b/cinelerra-5.1/plugins/polar/polar.C index 16812843..417afc71 100644 --- a/cinelerra-5.1/plugins/polar/polar.C +++ b/cinelerra-5.1/plugins/polar/polar.C @@ -28,6 +28,7 @@ #include "language.h" #include "loadbalance.h" #include "pluginvclient.h" +#include "theme.h" #include "vframe.h" @@ -98,7 +99,7 @@ public: PolarWindow *window; }; -class PolarSliderClr : public BC_GenericButton +class PolarSliderClr : public BC_Button { public: PolarSliderClr(PolarEffect *plugin, PolarWindow *window, int x, int y, int w, int clear); @@ -234,10 +235,10 @@ void PolarConfig::interpolate(PolarConfig &prev, PolarWindow::PolarWindow(PolarEffect *plugin) : PluginClientWindow(plugin, - 330, - 122, - 330, - 122, + xS(330), + yS(122), + xS(330), + yS(122), 0) { this->plugin = plugin; @@ -245,19 +246,21 @@ PolarWindow::PolarWindow(PolarEffect *plugin) void PolarWindow::create_objects() { - int x = 10, y = 10, x1 = x + 50; - int x2 = 0; int clrBtn_w = 50; + int xs10 = xS(10), xs50 = xS(50); + int ys10 = yS(10), ys40 = yS(40); + int x = xs10, y = ys10, x1 = x + xs50; + int x2 = 0; int clrBtn_w = xs50; add_subwindow(new BC_Title(x, y, _("Depth:"))); add_subwindow(depth = new PolarDepth(plugin, x1, y)); - x2 = x1 + depth->get_w() + 10; + x2 = x1 + depth->get_w() + xs10; add_subwindow(depthClr = new PolarSliderClr(plugin, this, x2, y, clrBtn_w, RESET_DEPTH)); - y += 40; + y += ys40; add_subwindow(new BC_Title(x, y, _("Angle:"))); add_subwindow(angle = new PolarAngle(plugin, x1, y)); add_subwindow(angleClr = new PolarSliderClr(plugin, this, x2, y, clrBtn_w, RESET_ANGLE)); - y += 40; + y += ys40; add_subwindow(reset = new PolarReset(plugin, this, x, y)); show_window(); @@ -288,8 +291,8 @@ PolarDepth::PolarDepth(PolarEffect *plugin, int x, int y) : BC_FSlider(x, y, 0, - 200, - 200, + xS(200), + yS(200), (float)1, (float)100, plugin->config.depth) @@ -311,8 +314,8 @@ PolarAngle::PolarAngle(PolarEffect *plugin, int x, int y) : BC_FSlider(x, y, 0, - 200, - 200, + xS(200), + yS(200), (float)1, (float)360, plugin->config.angle) @@ -347,7 +350,7 @@ int PolarReset::handle_event() PolarSliderClr::PolarSliderClr(PolarEffect *plugin, PolarWindow *window, int x, int y, int w, int clear) - : BC_GenericButton(x, y, w, _("⌂")) + : BC_Button(x, y, w, plugin->get_theme()->get_image_set("reset_button")) { this->plugin = plugin; this->window = window;