i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MediaPlayer: Make sure the window is on screen.

Browse Source 
* The existing check in _ResizeWindow() was avoided when there
  is an initial frame to use (when launching with an audio file).
This commit is contained in:
Axel Dörfler
2016-12-28 17:43:19 +01:00
parent 707717e8be
commit 4068f2821a
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/mediaplayer/MainWin.cpp
+3
View File
@@ -1872,6 +1872,8 @@ MainWin::_ResizeWindow(int percent, bool useNoVideoWidth, bool stayOnScreen)
if (!screenFrame.Contains(frame)) { if (!screenFrame.Contains(frame)) {
// Resize the window so it doesn't extend outside the current // Resize the window so it doesn't extend outside the current
// screen frame. // screen frame.
// We don't use BWindow::MoveOnScreen() in order to resize the
// window while keeping the same aspect ratio.
if (frame.Width() > screenFrame.Width() if (frame.Width() > screenFrame.Width()
|| frame.Height() > screenFrame.Height()) { || frame.Height() > screenFrame.Height()) {
// too large // too large
@@ -2396,6 +2398,7 @@ MainWin::_ShowIfNeeded()
if (!fHasVideo && fNoVideoFrame.IsValid()) { if (!fHasVideo && fNoVideoFrame.IsValid()) {
MoveTo(fNoVideoFrame.LeftTop()); MoveTo(fNoVideoFrame.LeftTop());
ResizeTo(fNoVideoFrame.Width(), fNoVideoFrame.Height()); ResizeTo(fNoVideoFrame.Width(), fNoVideoFrame.Height());
MoveOnScreen(B_MOVE_IF_PARTIALLY_OFFSCREEN);
} else if (fHasVideo && IsHidden()) } else if (fHasVideo && IsHidden())
CenterOnScreen(); CenterOnScreen();