X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fcolorbalance%2Fcolorbalancewindow.C;h=91a8cd10f2d25c1e4546f8df1c7a62261cee680d;hb=ae9b00c3f960e5bd9f74a9d9103e332f4c288ab4;hp=263f15ea39e50dfd44326b012a11581502682854;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/plugins/colorbalance/colorbalancewindow.C b/cinelerra-5.1/plugins/colorbalance/colorbalancewindow.C
index 263f15ea..91a8cd10 100644
--- a/cinelerra-5.1/plugins/colorbalance/colorbalancewindow.C
+++ b/cinelerra-5.1/plugins/colorbalance/colorbalancewindow.C
@@ -22,6 +22,7 @@
 #include "bcdisplayinfo.h"
 #include "colorbalancewindow.h"
 #include "language.h"
+#include "theme.h"
 
 
 
@@ -34,12 +35,7 @@
 
 
 ColorBalanceWindow::ColorBalanceWindow(ColorBalanceMain *client)
- : PluginClientWindow(client,
-	330,
-	250,
-	330,
-	250,
-	0)
+ : PluginClientWindow(client, xS(400), yS(210), xS(400), yS(210), 0)
 {
 	this->client = client;
 }
@@ -50,44 +46,69 @@ ColorBalanceWindow::~ColorBalanceWindow()
 
 void ColorBalanceWindow::create_objects()
 {
-	int x = 10, y = 10;
+	int xs10 = xS(10), xs70 = xS(70), xs280 = xS(280), xs400 = xS(400);
+	int ys10 = yS(10), ys15 = yS(15), ys25 = yS(25);
+	int x = xs10, y = ys10;
+	int clrBtn_w = xS(50);
+	int x1 = xs400 - clrBtn_w - xs10; // (window_width - clrBtn_width - margin_rx)
+
 	add_tool(new BC_Title(x, y, _("Color Balance")));
-	y += 25;
+	y += ys25;
 	add_tool(new BC_Title(x, y, _("Cyan")));
-	add_tool(cyan = new ColorBalanceSlider(client, &(client->config.cyan), x + 70, y));
-	add_tool(new BC_Title(x + 270, y, _("Red")));
-	y += 25;
+	add_tool(cyan = new ColorBalanceSlider(client, &(client->config.cyan), x + xs70, y));
+	add_tool(new BC_Title(x + xs280, y, _("Red")));
+	add_subwindow(cyanClr = new ColorBalanceSliderClr(client, this, x1, y, clrBtn_w, 1));
+
+	y += ys25;
 	add_tool(new BC_Title(x, y, _("Magenta")));
-	add_tool(magenta = new ColorBalanceSlider(client, &(client->config.magenta), x + 70, y));
-	add_tool(new BC_Title(x + 270, y, _("Green")));
-	y += 25;
+	add_tool(magenta = new ColorBalanceSlider(client, &(client->config.magenta), x + xs70, y));
+	add_tool(new BC_Title(x + xs280, y, _("Green")));
+	add_subwindow(magentaClr = new ColorBalanceSliderClr(client, this, x1, y, clrBtn_w, 2));
+
+	y += ys25;
 	add_tool(new BC_Title(x, y, _("Yellow")));
-	add_tool(yellow = new ColorBalanceSlider(client, &(client->config.yellow), x + 70, y));
-	add_tool(new BC_Title(x + 270, y, _("Blue")));
-	y += 25;
-	add_tool(preserve = new ColorBalancePreserve(client, x + 70, y));
-	y += preserve->get_h() + 10;
-	add_tool(lock_params = new ColorBalanceLock(client, x + 70, y));
-	y += lock_params->get_h() + 10;
-	add_tool(new ColorBalanceWhite(client, this, x, y));
-	y += lock_params->get_h() + 10;
+	add_tool(yellow = new ColorBalanceSlider(client, &(client->config.yellow), x + xs70, y));
+	add_tool(new BC_Title(x + xs280, y, _("Blue")));
+	add_subwindow(yellowClr = new ColorBalanceSliderClr(client, this, x1, y, clrBtn_w, 3));
+
+	y += ys25;
+	add_tool(preserve = new ColorBalancePreserve(client, x, y));
+	y += preserve->get_h() + ys10;
+	add_tool(lock_params = new ColorBalanceLock(client, x, y));
+
+	y += lock_params->get_h() + ys15;
 	add_tool(new ColorBalanceReset(client, this, x, y));
+	add_tool(new ColorBalanceWhite(client, this, int(xS(400) / 2), y));
 
 	show_window();
 	flush();
 }
 
-void ColorBalanceWindow::update()
+void ColorBalanceWindow::update_gui(int clear)
 {
-	cyan->update((int64_t)client->config.cyan);
-	magenta->update((int64_t)client->config.magenta);
-	yellow->update((int64_t)client->config.yellow);
+	switch(clear) {
+		case RESET_CYAN : cyan->update((int64_t)client->config.cyan);
+			break;
+		case RESET_MAGENTA : magenta->update((int64_t)client->config.magenta);
+			break;
+		case RESET_YELLOW : yellow->update((int64_t)client->config.yellow);
+			break;
+		case RESET_ALL :
+		case RESET_DEFAULT_SETTINGS :
+		default:
+			cyan->update((int64_t)client->config.cyan);
+			magenta->update((int64_t)client->config.magenta);
+			yellow->update((int64_t)client->config.yellow);
+			preserve->update(client->config.preserve);
+			lock_params->update(client->config.lock_params);
+			break;
+	}
 }
 
 
 ColorBalanceSlider::ColorBalanceSlider(ColorBalanceMain *client,
 	float *output, int x, int y)
- : BC_ISlider(x, y, 0, 200, 200, -1000, 1000, (int)*output)
+ : BC_ISlider(x, y, 0, xS(200), yS(200), -1000, 1000, (int)*output)
 {
 	this->client = client;
 	this->output = output;
@@ -195,7 +216,7 @@ int ColorBalanceWhite::handle_event()
 	plugin->config.cyan = plugin->calculate_slider(r_factor);
 	plugin->config.magenta = plugin->calculate_slider(g_factor);
 	plugin->config.yellow = plugin->calculate_slider(b_factor);
-	gui->update();
+	gui->update_gui(RESET_DEFAULT_SETTINGS);
 
 	plugin->send_configure_change();
 	return 1;
@@ -214,12 +235,29 @@ ColorBalanceReset::ColorBalanceReset(ColorBalanceMain *plugin,
 
 int ColorBalanceReset::handle_event()
 {
-	plugin->config.cyan = 0;
-	plugin->config.magenta = 0;
-	plugin->config.yellow = 0;
-	gui->update();
+	plugin->config.reset(RESET_ALL);
+	gui->update_gui(RESET_ALL);
 	plugin->send_configure_change();
 	return 1;
 }
 
 
+ColorBalanceSliderClr::ColorBalanceSliderClr(ColorBalanceMain *plugin,
+	ColorBalanceWindow *gui, int x, int y, int w, int clear)
+ : BC_Button(x, y, w, plugin->get_theme()->get_image_set("reset_button"))
+{
+	this->plugin = plugin;
+	this->gui = gui;
+	this->clear = clear;
+}
+ColorBalanceSliderClr::~ColorBalanceSliderClr()
+{
+}
+int ColorBalanceSliderClr::handle_event()
+{
+	plugin->config.reset(clear);
+	gui->update_gui(clear);
+	plugin->send_configure_change();
+	return 1;
+}
+