projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bg/clr color tweaks, clear borders rework, fc31 depends
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
plugins
/
brightness
/
brightnesswindow.C
diff --git
a/cinelerra-5.1/plugins/brightness/brightnesswindow.C
b/cinelerra-5.1/plugins/brightness/brightnesswindow.C
index 72d9e82ac0afb78246869f0e30bdccd077fdf824..2552e20ea62223fdc4316de7d28ae2727afd0b98 100644
(file)
--- a/
cinelerra-5.1/plugins/brightness/brightnesswindow.C
+++ b/
cinelerra-5.1/plugins/brightness/brightnesswindow.C
@@
-22,6
+22,7
@@
#include "bcdisplayinfo.h"
#include "brightnesswindow.h"
#include "language.h"
#include "bcdisplayinfo.h"
#include "brightnesswindow.h"
#include "language.h"
+#include "theme.h"
@@
-32,7
+33,7
@@
BrightnessWindow::BrightnessWindow(BrightnessMain *client)
BrightnessWindow::BrightnessWindow(BrightnessMain *client)
- : PluginClientWindow(client,
370, 155, 370, 155
, 0)
+ : PluginClientWindow(client,
xS(370), yS(155), xS(370), yS(155)
, 0)
{
this->client = client;
}
{
this->client = client;
}
@@
-43,20
+44,22
@@
BrightnessWindow::~BrightnessWindow()
void BrightnessWindow::create_objects()
{
void BrightnessWindow::create_objects()
{
- int x = 10, y = 10, x1 = x + 90;
- int x2 = 0; int clrBtn_w = 50;
+ int xs10 = xS(10);
+ int ys10 = yS(10), ys25 = yS(25), ys30 = yS(30), ys35 = yS(35);
+ int x = xs10, y = ys10, x1 = x + xS(90);
+ int x2 = 0; int clrBtn_w = xS(50);
add_tool(new BC_Title(x, y, _("Brightness/Contrast")));
add_tool(new BC_Title(x, y, _("Brightness/Contrast")));
- y += 25;
+ y +=
ys
25;
add_tool(new BC_Title(x, y,_("Brightness:")));
add_tool(brightness = new BrightnessSlider(client,
&(client->config.brightness),
x1,
y,
1));
add_tool(new BC_Title(x, y,_("Brightness:")));
add_tool(brightness = new BrightnessSlider(client,
&(client->config.brightness),
x1,
y,
1));
- x2 = x1 + brightness->get_w() + 10;
+ x2 = x1 + brightness->get_w() +
xs
10;
add_subwindow(brightnessClr = new BrightnessSliderClr(client, this, x2, y, clrBtn_w, 1));
add_subwindow(brightnessClr = new BrightnessSliderClr(client, this, x2, y, clrBtn_w, 1));
- y += 25;
+ y +=
ys
25;
add_tool(new BC_Title(x, y, _("Contrast:")));
add_tool(contrast = new BrightnessSlider(client,
&(client->config.contrast),
add_tool(new BC_Title(x, y, _("Contrast:")));
add_tool(contrast = new BrightnessSlider(client,
&(client->config.contrast),
@@
-65,12
+68,12
@@
void BrightnessWindow::create_objects()
0));
add_subwindow(contrastClr = new BrightnessSliderClr(client, this, x2, y, clrBtn_w, 0));
0));
add_subwindow(contrastClr = new BrightnessSliderClr(client, this, x2, y, clrBtn_w, 0));
- y += 30;
+ y +=
ys
30;
add_tool(luma = new BrightnessLuma(client,
x,
y));
add_tool(luma = new BrightnessLuma(client,
x,
y));
- y += 35;
+ y +=
ys
35;
add_subwindow(reset = new BrightnessReset(client, this, x, y));
show_window();
add_subwindow(reset = new BrightnessReset(client, this, x, y));
show_window();
@@
-102,8
+105,8
@@
BrightnessSlider::BrightnessSlider(BrightnessMain *client,
: BC_FSlider(x,
y,
0,
: BC_FSlider(x,
y,
0,
-
200
,
-
200
,
+
xS(200)
,
+
yS(200)
,
-100,
100,
(int)*output)
-100,
100,
(int)*output)
@@
-179,7
+182,7
@@
int BrightnessReset::handle_event()
}
BrightnessSliderClr::BrightnessSliderClr(BrightnessMain *client, BrightnessWindow *window, int x, int y, int w, int is_brightness)
}
BrightnessSliderClr::BrightnessSliderClr(BrightnessMain *client, BrightnessWindow *window, int x, int y, int w, int is_brightness)
- : BC_
GenericButton(x, y, w, _("⌂
"))
+ : BC_
Button(x, y, w, client->get_theme()->get_image_set("reset_button
"))
{
this->client = client;
this->window = window;
{
this->client = client;
this->window = window;