projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
es.po update by rafa, add ms win10 cygwin port, add pulseaudio, new config flags...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
canvas.C
diff --git
a/cinelerra-5.1/cinelerra/canvas.C
b/cinelerra-5.1/cinelerra/canvas.C
index e3e1b0f3381d2d826fe1a16f7b3aa7ce0df1ce05..17d5a42b5e952de5b515ccdc1650bde8e76b2484 100644
(file)
--- a/
cinelerra-5.1/cinelerra/canvas.C
+++ b/
cinelerra-5.1/cinelerra/canvas.C
@@
-692,19
+692,17
@@
int Canvas::button_press_event_base(BC_WindowBase *caller)
int Canvas::keypress_event(BC_WindowBase *caller)
{
int key = caller->get_keypress();
int Canvas::keypress_event(BC_WindowBase *caller)
{
int key = caller->get_keypress();
- int on = -1;
switch( key ) {
switch( key ) {
- case 'f':
- on = get_fullscreen() ? 0 : 1;
- break;
+ case 'f': {
+ int on = get_fullscreen() ? 0 : 1;
+ set_fullscreen(on, 1);
+ break; }
case ESC:
case ESC:
-
on = 0
;
+
set_fullscreen(0, 1)
;
break;
default:
return 0;
}
break;
default:
return 0;
}
- if( on >= 0 )
- set_fullscreen(on);
return 1;
}
return 1;
}
@@
-931,7
+929,7
@@
int CanvasSubWindowItem::handle_event()
{
// It isn't a problem to delete the canvas from in here because the event
// dispatcher is the canvas subwindow.
{
// It isn't a problem to delete the canvas from in here because the event
// dispatcher is the canvas subwindow.
- canvas->set_fullscreen(0);
+ canvas->set_fullscreen(0
, 1
);
return 1;
}
return 1;
}
@@
-1115,7
+1113,7
@@
CanvasFullScreenItem::CanvasFullScreenItem(Canvas *canvas)
}
int CanvasFullScreenItem::handle_event()
{
}
int CanvasFullScreenItem::handle_event()
{
- canvas->set_fullscreen(1);
+ canvas->set_fullscreen(1
, 1
);
return 1;
}
return 1;
}