projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d456e97
)
swaroop: hopefully fix wallpaper apparition.
v2.13.112
author
Carl Hetherington
<cth@carlh.net>
Mon, 4 Feb 2019 00:56:31 +0000
(
00:56
+0000)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 4 Feb 2019 00:56:31 +0000
(
00:56
+0000)
src/wx/film_viewer.cc
patch
|
blob
|
history
diff --git
a/src/wx/film_viewer.cc
b/src/wx/film_viewer.cc
index 8b58d42f0f508f8e813e83acaea1544546b94164..dd088db20fa2d59c0c201b0fdca3e260e64c7ba3 100644
(file)
--- a/
src/wx/film_viewer.cc
+++ b/
src/wx/film_viewer.cc
@@
-330,21
+330,17
@@
FilmViewer::paint_panel ()
{
wxPaintDC dc (_panel);
{
wxPaintDC dc (_panel);
- if (!_out_size.width || !_out_size.height ||
(_frame && _out_size != _frame->size()
)) {
+ if (!_out_size.width || !_out_size.height ||
!_frame || _out_size != _frame->size(
)) {
dc.Clear ();
return;
}
dc.Clear ();
return;
}
- if (!_f
rame || !_f
ilm) {
+ if (!_film) {
dc.Clear ();
maybe_draw_background_image (dc);
return;
}
dc.Clear ();
maybe_draw_background_image (dc);
return;
}
- if (_video_position == DCPTime() && maybe_draw_background_image (dc)) {
- return;
- }
-
wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true);
wxBitmap frame_bitmap (frame);
dc.DrawBitmap (frame_bitmap, 0, max(0, (_panel_size.height - _out_size.height) / 2));
wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true);
wxBitmap frame_bitmap (frame);
dc.DrawBitmap (frame_bitmap, 0, max(0, (_panel_size.height - _out_size.height) / 2));