projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
histogram fix, use_thumbnails fix, zoom popup width tweak, cut/paste for mixer apply...
[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 14e4351db0e84d2fc13f97ed8cc749b0c2d33cf6..85316aaa5aefce2ad5b4b8b27c9fd9adca544ad3 100644
(file)
--- a/
cinelerra-5.1/cinelerra/canvas.C
+++ b/
cinelerra-5.1/cinelerra/canvas.C
@@
-767,8
+767,7
@@
void Canvas::create_canvas()
int x, y, w, h;
wdw->get_fullscreen_geometry(x, y, w, h);
int x, y, w, h;
wdw->get_fullscreen_geometry(x, y, w, h);
- if( canvas_fullscreen )
- {
+ if( canvas_fullscreen ) {
if( x != canvas_fullscreen->get_x() ||
y != canvas_fullscreen->get_y() ||
w != canvas_fullscreen->get_w() ||
if( x != canvas_fullscreen->get_x() ||
y != canvas_fullscreen->get_y() ||
w != canvas_fullscreen->get_w() ||
@@
-777,26
+776,21
@@
void Canvas::create_canvas()
canvas_fullscreen = 0;
}
}
canvas_fullscreen = 0;
}
}
- if(!canvas_fullscreen)
- {
+ if( !canvas_fullscreen )
canvas_fullscreen = new CanvasFullScreen(this, w, h);
canvas_fullscreen = new CanvasFullScreen(this, w, h);
- }
- else
- {
- canvas_fullscreen->reposition_window(x, y);
- canvas_fullscreen->show_window();
- }
+ canvas_fullscreen->show_window();
+ canvas_fullscreen->sync_display();
+ canvas_fullscreen->reposition_window(x, y);
}
}
-
- if(!video_on)
- {
+ if( !video_on ) {
get_canvas()->lock_window("Canvas::create_canvas 1");
draw_refresh();
get_canvas()->unlock_window();
}
get_canvas()->lock_window("Canvas::create_canvas 1");
draw_refresh();
get_canvas()->unlock_window();
}
- if(video_on) get_canvas()->start_video();
+ if( video_on )
+ get_canvas()->start_video();
get_canvas()->lock_window("Canvas::create_canvas 2");
get_canvas()->focus();
get_canvas()->lock_window("Canvas::create_canvas 2");
get_canvas()->focus();