projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework cpozer zoom slider
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
cwindowtool.C
diff --git
a/cinelerra-5.1/cinelerra/cwindowtool.C
b/cinelerra-5.1/cinelerra/cwindowtool.C
index 026aa32003c605075a1929435ab5370073a57d78..ee1c1044f2e34cec1871b278196ae66026ba4799 100644
(file)
--- a/
cinelerra-5.1/cinelerra/cwindowtool.C
+++ b/
cinelerra-5.1/cinelerra/cwindowtool.C
@@
-812,9
+812,9
@@
void CWindowCameraGUI::handle_event()
if(z_auto)
{
float zoom = atof(z->get_text());
if(z_auto)
{
float zoom = atof(z->get_text());
- if(zoom > 10
) zoom = 10
;
+ if(zoom > 10
0.) zoom = 100.
;
else
else
- if(zoom < 0
) zoom = 0
;
+ if(zoom < 0
.01) zoom = 0.01
;
// Doesn't allow user to enter from scratch
// if(zoom != atof(z->get_text()))
// z->update(zoom);
// Doesn't allow user to enter from scratch
// if(zoom != atof(z->get_text()))
// z->update(zoom);
@@
-855,8
+855,11
@@
void CWindowCameraGUI::update()
x->update(x_auto->get_value());
if(y_auto)
y->update(y_auto->get_value());
x->update(x_auto->get_value());
if(y_auto)
y->update(y_auto->get_value());
- if(z_auto)
- z->update(z_auto->get_value());
+ if(z_auto) {
+ float value = z_auto->get_value();
+ z->update(value);
+ thread->gui->composite_panel->cpanel_zoom->update(value);
+ }
if( x_auto && y_auto && z_auto )
{
if( x_auto && y_auto && z_auto )
{
@@
-1257,9
+1260,8
@@
void CWindowProjectorGUI::handle_event()
if(z_auto)
{
float zoom = atof(z->get_text());
if(z_auto)
{
float zoom = atof(z->get_text());
- if(zoom > 10000) zoom = 10000;
- else
- if(zoom < 0) zoom = 0;
+ if(zoom > 100.) zoom = 100.;
+ else if(zoom < 0.01) zoom = 0.01;
// if (zoom != atof(z->get_text()))
// z->update(zoom);
z_auto->set_value(zoom);
// if (zoom != atof(z->get_text()))
// z->update(zoom);
z_auto->set_value(zoom);
@@
-1299,8
+1301,11
@@
void CWindowProjectorGUI::update()
x->update(x_auto->get_value());
if(y_auto)
y->update(y_auto->get_value());
x->update(x_auto->get_value());
if(y_auto)
y->update(y_auto->get_value());
- if(z_auto)
- z->update(z_auto->get_value());
+ if(z_auto) {
+ float value = z_auto->get_value();
+ z->update(value);
+ thread->gui->composite_panel->cpanel_zoom->update(value);
+ }
if( x_auto && y_auto && z_auto )
{
if( x_auto && y_auto && z_auto )
{