mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Make detached video display reposition itself if it opens partially or entirely out of view. Updates #1040.

Browse source 
Originally committed to SVN as r3774.
This commit is contained in:
Niels Martin Hansen 2009-11-14 00:42:55 +00:00
parent d6b0cdcedf
commit 58674d1cea
1 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
aegisub/src/dialog_detached_video.cpp
View file

@ -48,6 +48,9 @@
#include "video_display.h"
#include "video_slider.h"
#undef min
#undef max
/// @brief Constructor
/// @param par FrameMain this was spawned from
@ -90,8 +93,40 @@ DialogDetachedVideo::DialogDetachedVideo(FrameMain *par, const wxSize &initialDi
videoBox->SetMinSize(wxSize(1,1));
SetMinSize(wxSize(1,1));
int display_index = wxDisplay::GetFromWindow(this);
if (display_index == wxNOT_FOUND)
{
int caption_size = wxSystemSettings::GetMetric(wxSYS_CAPTION_Y, this);
Move(par->GetPosition() + wxPoint(caption_size, caption_size));
}
else
{
wxRect bounds_rect = GetRect();
wxRect disp_rect = wxDisplay(display_index).GetClientArea();
// Ensure our x/y position is past the top left of the display
int new_x = std::max(bounds_rect.x, disp_rect.x);
int new_y = std::max(bounds_rect.y, disp_rect.y);
// Pick the smallest size of display and window.
// By doing this, we're guaranteed to get a width/height that fits on the display
// and won't have to adjust width/height any further.
int new_w = std::min(bounds_rect.width, disp_rect.width);
int new_h = std::min(bounds_rect.height, disp_rect.height);
// Check if bottom right corner is outside display and move inside then
if (new_x + new_w > disp_rect.x + disp_rect.width)
new_x = disp_rect.x + disp_rect.width - new_w;
if (new_y + new_h > disp_rect.y + disp_rect.height)
new_y = disp_rect.y + disp_rect.height - new_h;
SetSize(new_x, new_y, new_w, new_h, wxSIZE_ALLOW_MINUS_ONE);
}
// Update
parent->SetDisplayMode(0, -1);
GetPosition(&x, &y);
Options.SetInt(_T("Detached video last x"), x);
Options.SetInt(_T("Detached video last y"), y);
Options.SetBool(_T("Detached video"),true);
Options.Save();