X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Feditpopup.C;h=34aadc468797c4eba2746b7e29b44a27a4d4359a;hp=7ba0e6a12d0d428da417fe75b085ebbbeccb6b7f;hb=20e53b92d93df8fe3c3b99c9134f992b156330db;hpb=e26fa8bc220d47d1c35618b6b6d971188afe7fdd

diff --git a/cinelerra-5.1/cinelerra/editpopup.C b/cinelerra-5.1/cinelerra/editpopup.C
index 7ba0e6a1..34aadc46 100644
--- a/cinelerra-5.1/cinelerra/editpopup.C
+++ b/cinelerra-5.1/cinelerra/editpopup.C
@@ -116,7 +116,7 @@ EditPopupCopy::EditPopupCopy(MWindow *mwindow, EditPopup *popup)
 
 int EditPopupCopy::handle_event()
 {
-	mwindow->selected_to_clipboard(0);
+	mwindow->selected_edits_to_clipboard(0);
 	return 1;
 }
 
@@ -131,7 +131,7 @@ EditPopupCopyPack::EditPopupCopyPack(MWindow *mwindow, EditPopup *popup)
 
 int EditPopupCopyPack::handle_event()
 {
-	mwindow->selected_to_clipboard(1);
+	mwindow->selected_edits_to_clipboard(1);
 	return 1;
 }
 
@@ -423,10 +423,11 @@ int EditPopupTitleColor::handle_event()
 {
 	if( popup->edit ) {
 		int color = popup->mwindow->get_title_color(popup->edit);
-		if( color < 0 ) color = popup->mwindow->theme->get_color_title_bg();
+		if( !color ) color = popup->mwindow->theme->get_color_title_bg();
 		delete color_picker;
-		color_picker = new EditTitleColorPicker(popup);
-		color_picker->start_window(color, -1, 1);
+		color_picker = new EditTitleColorPicker(popup, color);
+		int alpha = (~color>>24) & 0xff;
+		color_picker->start_window(color & 0xffffff, alpha, 1);
 	}
 	return 1;
 }
@@ -440,30 +441,32 @@ EditTitleColorDefault::EditTitleColorDefault(
 
 int EditTitleColorDefault::handle_event()
 {
-	int color = color_picker->popup->mwindow->theme->get_color_title_bg();
-	color_picker->update_gui(color, -1);
+	const int color = 0, alpha = 0xff;
+	color_picker->color = color | (~alpha << 24);
+	color_picker->update_gui(color, alpha);
 	return 1;
 }
 
-EditTitleColorPicker::EditTitleColorPicker(EditPopup *popup)
- : ColorPicker(0, _("Bar Color"))
+EditTitleColorPicker::EditTitleColorPicker(EditPopup *popup, int color)
+ : ColorPicker(1, _("Bar Color"))
 {
 	this->popup = popup;
-	color = -1;
+	this->color = color;
 }
 EditTitleColorPicker::~EditTitleColorPicker()
 {
 }
 void EditTitleColorPicker::create_objects(ColorWindow *gui)
 {
-	int y = gui->get_h() - BC_CancelButton::calculate_h() - 50;
-	int x = gui->get_w() - BC_GenericButton::calculate_w(gui, _("default")) - 15;
+	int y = gui->get_h() - BC_CancelButton::calculate_h() + 10;
+	int x = gui->get_w() - BC_CancelButton::calculate_w() - 10;
+	x -= BC_GenericButton::calculate_w(gui, _("default")) + 15;
 	gui->add_subwindow(new EditTitleColorDefault(this, x, y));
 }
 
 int EditTitleColorPicker::handle_new_color(int color, int alpha)
 {
-	this->color = color;
+	this->color = color | (~alpha << 24);
 	return 1;
 }