projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tweak zoom/fullscr to remember cwdw scale after fullscr
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
vwindowgui.C
diff --git
a/cinelerra-5.1/cinelerra/vwindowgui.C
b/cinelerra-5.1/cinelerra/vwindowgui.C
index 8ecdb0d624d39fa9e58da292ee50a838c600d4ac..7c1d51e0a0df80a702a4fd34d5cc526055f4eed1 100644
(file)
--- a/
cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/vwindowgui.C
@@
-364,15
+364,10
@@
int VWindowGUI::keypress_event()
mwindow->redo_entry(this);
break;
case 'f':
mwindow->redo_entry(this);
break;
case 'f':
- unlock_window();
- canvas->use_fullscreen(canvas->get_fullscreen() ? 0 : 1);
- lock_window("VWindowGUI::keypress_event 1");
+ canvas->set_fullscreen(canvas->get_fullscreen() ? 0 : 1);
break;
case ESC:
break;
case ESC:
- unlock_window();
- if( canvas->get_fullscreen() )
- canvas->use_fullscreen(0);
- lock_window("VWindowGUI::keypress_event 2");
+ canvas->set_fullscreen(0);
break;
case KEY_F1:
case KEY_F2:
break;
case KEY_F1:
case KEY_F2:
@@
-878,14
+873,3
@@
void VWindowCanvas::draw_overlays()
}
}
}
}
-int VWindowCanvas::use_fullscreen(int on)
-{
- if( Canvas::use_fullscreen(on) ) {
- gui->lock_window("VWindowCanvas::use_fullscreen");
- zoom_auto();
- draw_refresh(1);
- gui->unlock_window();
- }
- return 1;
-}
-