projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cin_db Makefile tweak, awdw vicon stop draw lock rework,
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
plugins
/
titler
/
titlerwindow.C
diff --git
a/cinelerra-5.1/plugins/titler/titlerwindow.C
b/cinelerra-5.1/plugins/titler/titlerwindow.C
index de6d10cbda4d64c5e6e558ec3c5f99e9d7bc95b6..f8705dfd6d8fe2763767de452ad377b2d73b8fb8 100644
(file)
--- a/
cinelerra-5.1/plugins/titler/titlerwindow.C
+++ b/
cinelerra-5.1/plugins/titler/titlerwindow.C
@@
-261,11
+261,13
@@
void TitleWindow::create_objects()
add_tool(bold = new TitleBold(client, this, x, y + yS(50)));
if( bold->get_w() > w1 ) w1 = bold->get_w();
add_tool(bold = new TitleBold(client, this, x, y + yS(50)));
if( bold->get_w() > w1 ) w1 = bold->get_w();
+ if( client->drag && drag->drag_activate() ) {
+ eprintf("drag enabled, but compositor already grabbed\n");
+ client->drag = 0;
+ }
add_tool(drag = new TitleDrag(client, this, x, y + yS(80)));
drag->create_objects();
if( drag->get_w() > w1 ) w1 = drag->get_w();
add_tool(drag = new TitleDrag(client, this, x, y + yS(80)));
drag->create_objects();
if( drag->get_w() > w1 ) w1 = drag->get_w();
- if( client->config.drag && drag->drag_activate() )
- eprintf("drag enabled, but compositor already grabbed\n");
add_tool(alias = new TitleAlias(client, this, x, y+yS(110)));
if( alias->get_w() > w1 ) w1 = drag->get_w();
add_tool(alias = new TitleAlias(client, this, x, y+yS(110)));
if( alias->get_w() > w1 ) w1 = drag->get_w();
@@
-1232,7
+1234,7
@@
int TitleBottom::handle_event()
}
TitleDrag::TitleDrag(TitleMain *client, TitleWindow *window, int x, int y)
}
TitleDrag::TitleDrag(TitleMain *client, TitleWindow *window, int x, int y)
- : DragCheckBox(client->server->mwindow, x, y, _("Drag"), &client->
config.
drag,
+ : DragCheckBox(client->server->mwindow, x, y, _("Drag"), &client->drag,
client->config.title_x, client->config.title_y,
client->config.title_w, client->config.title_h)
{
client->config.title_x, client->config.title_y,
client->config.title_w, client->config.title_h)
{
@@
-1254,7
+1256,7
@@
int64_t TitleDrag::get_drag_position()
void TitleDrag::update_gui()
{
void TitleDrag::update_gui()
{
- client->
config.
drag = get_value();
+ client->drag = get_value();
client->config.title_x = drag_x;
client->config.title_y = drag_y;
client->config.title_w = drag_w+0.5;
client->config.title_x = drag_x;
client->config.title_y = drag_y;
client->config.title_w = drag_w+0.5;
@@
-1269,6
+1271,7
@@
void TitleDrag::update_gui()
int TitleDrag::handle_event()
{
int ret = DragCheckBox::handle_event();
int TitleDrag::handle_event()
{
int ret = DragCheckBox::handle_event();
+ client->drag = get_value();
window->send_configure_change();
return ret;
}
window->send_configure_change();
return ret;
}