projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yet another proxy ref fix
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
cwindowgui.C
diff --git
a/cinelerra-5.1/cinelerra/cwindowgui.C
b/cinelerra-5.1/cinelerra/cwindowgui.C
index 9301f19dd184d39dc062dc99cfdbce65b576204b..24a515fa83a3f3ec6009ab7211651dab01990545 100644
(file)
--- a/
cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/cwindowgui.C
@@
-92,23
+92,28
@@
CWindowGUI::CWindowGUI(MWindow *mwindow, CWindow *cwindow)
this->mwindow = mwindow;
this->cwindow = cwindow;
affected_track = 0;
this->mwindow = mwindow;
this->cwindow = cwindow;
affected_track = 0;
- affected_x = 0;
- affected_y = 0;
- affected_z = 0;
+ affected_x = affected_y = affected_z = 0;
mask_keyframe = 0;
orig_mask_keyframe = new MaskAuto(0, 0);
affected_point = 0;
mask_keyframe = 0;
orig_mask_keyframe = new MaskAuto(0, 0);
affected_point = 0;
- x_offset = 0;
- y_offset = 0;
- x_origin = 0;
- y_origin = 0;
+ x_offset = y_offset = 0;
+ x_origin = y_origin = 0;
current_operation = CWINDOW_NONE;
tool_panel = 0;
current_operation = CWINDOW_NONE;
tool_panel = 0;
- translating_zoom = 0;
active = 0;
inactive = 0;
active = 0;
inactive = 0;
- crop_translate = 0;
+ crop_handle = -1; crop_translate = 0;
+ crop_origin_x = crop_origin_y = 0;
+ crop_origin_x1 = crop_origin_y1 = 0;
+ crop_origin_x2 = crop_origin_y2 = 0;
eyedrop_visible = 0;
eyedrop_visible = 0;
+ eyedrop_x = eyedrop_y = 0;
+ ruler_origin_x = ruler_origin_y = 0;
+ ruler_handle = -1; ruler_translate = 0;
+ center_x = center_y = center_z = 0;
+ control_in_x = control_in_y = 0;
+ control_out_x = control_out_y = 0;
+ translating_zoom = 0;
highlighted = 0;
}
highlighted = 0;
}
@@
-381,7
+386,7
@@
void CWindowGUI::zoom_canvas(double value, int update_menu)
x = output_x - cx / zoom;
y = output_y - cy / zoom;
}
x = output_x - cx / zoom;
y = output_y - cy / zoom;
}
- canvas->update_zoom((int)
x, (int)y
, zoom);
+ canvas->update_zoom((int)
(x+0.5), (int)(y+0.5)
, zoom);
if( update_menu )
zoom_panel->update(value);
if( update_menu )
zoom_panel->update(value);
@@
-721,7
+726,7
@@
CWrapper(next_edit)
void CWindowEditing::to_clip()
{
void CWindowEditing::to_clip()
{
- mwindow->to_clip(_("composer window: "));
+ mwindow->to_clip(
mwindow->edl,
_("composer window: "));
}
}