projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve resize flash operation, fixup xv grab/ungrab, fixup label updates
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
recordmonitor.C
diff --git
a/cinelerra-5.1/cinelerra/recordmonitor.C
b/cinelerra-5.1/cinelerra/recordmonitor.C
index 1ab31ffb4a85c0d8076172b83e97ca0660c070a5..7ea18e1dfb1066acf5e0289b9c30449ef31b1fb9 100644
(file)
--- a/
cinelerra-5.1/cinelerra/recordmonitor.C
+++ b/
cinelerra-5.1/cinelerra/recordmonitor.C
@@
-347,7
+347,7
@@
void RecordMonitorGUI::create_objects()
add_subwindow(avc1394transport_timecode =
new BC_Title(avc1394_transport->x_end,
mwindow->theme->rmonitor_tx_y + 10,
add_subwindow(avc1394transport_timecode =
new BC_Title(avc1394_transport->x_end,
mwindow->theme->rmonitor_tx_y + 10,
-
_("00:00:00:00")
,
+
"00:00:00:00"
,
MEDIUM_7SEGMENT,
BLACK));
MEDIUM_7SEGMENT,
BLACK));
@@
-437,16
+437,6
@@
int RecordMonitorGUI::button_press_event()
{
if(mwindow->session->rwindow_fullscreen && canvas && canvas->get_canvas())
return canvas->button_press_event_base(canvas->get_canvas());
{
if(mwindow->session->rwindow_fullscreen && canvas && canvas->get_canvas())
return canvas->button_press_event_base(canvas->get_canvas());
-
- if( get_buttonpress() == 2 ) {
- return 0;
- }
- else
-// Right button
- if( get_buttonpress() == 3 ) {
- monitor_menu->activate_menu();
- return 1;
- }
return 0;
}
return 0;
}
@@
-466,6
+456,10
@@
int RecordMonitorGUI::cursor_enter_event()
int RecordMonitorGUI::button_release_event()
{
int RecordMonitorGUI::button_release_event()
{
+ if( get_buttonpress() == 3 && cursor_inside() ) {
+ monitor_menu->activate_menu();
+ return 1;
+ }
if( canvas && canvas->get_canvas() )
return canvas->button_release_event();
return 0;
if( canvas && canvas->get_canvas() )
return canvas->button_release_event();
return 0;
@@
-862,6
+856,9
@@
RecordMonitorFullsize::RecordMonitorFullsize(MWindow *mwindow,
}
int RecordMonitorFullsize::handle_event()
{
}
int RecordMonitorFullsize::handle_event()
{
+ Record *record = window->record;
+ record->video_zoom = 1.0;
+ record->record_gui->set_translation(record->video_x, record->video_y, record->video_zoom);
return 1;
}
return 1;
}