projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update
[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 9b9ebb6432d119546ee869b761eb98f2083ac17e..de6d10cbda4d64c5e6e558ec3c5f99e9d7bc95b6 100644
(file)
--- a/
cinelerra-5.1/plugins/titler/titlerwindow.C
+++ b/
cinelerra-5.1/plugins/titler/titlerwindow.C
@@
-140,7
+140,7
@@
TitleWindow::~TitleWindow()
delete title_x;
delete title_y;
delete title_w;
delete title_x;
delete title_y;
delete title_w;
- delete title_
y
;
+ delete title_
h
;
}
void TitleWindow::create_objects()
}
void TitleWindow::create_objects()
@@
-264,10
+264,8
@@
void TitleWindow::create_objects()
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 ) {
- if( drag->drag_activate() )
- eprintf("drag enabled, but compositor already grabbed\n");
- }
+ 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();
@@
-574,6
+572,10
@@
void TitleWindow::update_gui()
title_y->update((int64_t)client->config.title_y);
title_w->update((int64_t)client->config.title_w);
title_h->update((int64_t)client->config.title_h);
title_y->update((int64_t)client->config.title_y);
title_w->update((int64_t)client->config.title_w);
title_h->update((int64_t)client->config.title_h);
+ drag->drag_x = client->config.title_x;
+ drag->drag_y = client->config.title_y;
+ drag->drag_w = client->config.title_w;
+ drag->drag_h = client->config.title_h;
italic->update(client->config.style & BC_FONT_ITALIC);
bold->update(client->config.style & BC_FONT_BOLD);
alias->update(client->config.style & FONT_ALIAS);
italic->update(client->config.style & BC_FONT_ITALIC);
bold->update(client->config.style & BC_FONT_BOLD);
alias->update(client->config.style & FONT_ALIAS);