projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes for checkin 2 times ago
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
plugins
/
swapchannels
/
swapchannels.C
diff --git
a/cinelerra-5.1/plugins/swapchannels/swapchannels.C
b/cinelerra-5.1/plugins/swapchannels/swapchannels.C
index 52ab4caf3005809fec32ba258e7f9a7f73a3d3c4..3fc831fbe1a739f6007ab380ea961041bd847d50 100644
(file)
--- a/
cinelerra-5.1/plugins/swapchannels/swapchannels.C
+++ b/
cinelerra-5.1/plugins/swapchannels/swapchannels.C
@@
-85,10
+85,10
@@
void SwapConfig::copy_from(SwapConfig &that)
SwapWindow::SwapWindow(SwapMain *plugin)
: PluginClientWindow(plugin,
SwapWindow::SwapWindow(SwapMain *plugin)
: PluginClientWindow(plugin,
-
250
,
-
200
,
-
250
,
-
200
,
+
xS(250)
,
+
yS(200)
,
+
xS(250)
,
+
yS(200)
,
0)
{
this->plugin = plugin;
0)
{
this->plugin = plugin;
@@
-101,28
+101,30
@@
SwapWindow::~SwapWindow()
void SwapWindow::create_objects()
{
void SwapWindow::create_objects()
{
- int x = 10, y = 10;
- int margin = 30;
+ int xs10 = xS(10), xs30 = xS(30), xs160 = xS(160);
+ int ys5 = yS(5), ys10 = yS(10), ys40 = yS(40);
+ int x = xs10, y = ys10;
+ int margin = xs30;
add_subwindow(new BC_Title(x, y, _("Swap channels")));
y += margin;
add_subwindow(new BC_Title(x, y, _("Swap channels")));
y += margin;
- add_subwindow(new BC_Title(x +
160, y +
5, _("-> Red")));
+ add_subwindow(new BC_Title(x +
xs160, y + ys
5, _("-> Red")));
add_subwindow(red = new SwapMenu(plugin, &(plugin->config.red), x, y));
red->create_objects();
y += margin;
add_subwindow(red = new SwapMenu(plugin, &(plugin->config.red), x, y));
red->create_objects();
y += margin;
- add_subwindow(new BC_Title(x +
160, y +
5, _("-> Green")));
+ add_subwindow(new BC_Title(x +
xs160, y + ys
5, _("-> Green")));
add_subwindow(green = new SwapMenu(plugin, &(plugin->config.green), x, y));
green->create_objects();
y += margin;
add_subwindow(green = new SwapMenu(plugin, &(plugin->config.green), x, y));
green->create_objects();
y += margin;
- add_subwindow(new BC_Title(x +
160, y +
5, _("-> Blue")));
+ add_subwindow(new BC_Title(x +
xs160, y + ys
5, _("-> Blue")));
add_subwindow(blue = new SwapMenu(plugin, &(plugin->config.blue), x, y));
blue->create_objects();
y += margin;
add_subwindow(blue = new SwapMenu(plugin, &(plugin->config.blue), x, y));
blue->create_objects();
y += margin;
- add_subwindow(new BC_Title(x +
160, y +
5, _("-> Alpha")));
+ add_subwindow(new BC_Title(x +
xs160, y + ys
5, _("-> Alpha")));
add_subwindow(alpha = new SwapMenu(plugin, &(plugin->config.alpha), x, y));
alpha->create_objects();
add_subwindow(alpha = new SwapMenu(plugin, &(plugin->config.alpha), x, y));
alpha->create_objects();
- y += 40;
+ y +=
ys
40;
add_subwindow(reset = new SwapReset(plugin, this, x, y));
show_window();
add_subwindow(reset = new SwapReset(plugin, this, x, y));
show_window();
@@
-137,7
+139,7
@@
void SwapWindow::create_objects()
SwapMenu::SwapMenu(SwapMain *client, int *output, int x, int y)
SwapMenu::SwapMenu(SwapMain *client, int *output, int x, int y)
- : BC_PopupMenu(x, y,
150
, client->output_to_text(*output))
+ : BC_PopupMenu(x, y,
xS(150)
, client->output_to_text(*output))
{
this->client = client;
this->output = output;
{
this->client = client;
this->output = output;