Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 19:08:26 -06:00
Code Activity

MacOSX: Ensure that the heading bar is always visible when window is moved so that it can still be moved by user using mouse (https://github.com/veracrypt/VeraCrypt/issues/546)

Browse Source
This commit is contained in:
Mounir IDRASSI
2019-12-15 22:08:05 +01:00
parent a81d45df82
commit 1e978e69cc
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Main/Forms/MainFrame.h
View File

@@ -162,8 +162,12 @@ namespace VeraCrypt
void UpdateVolumeList ();
void UpdateWipeCacheButton ();
void WipeCache ();
void EnsureVisible()
#ifdef TC_MACOSX
void OnMoveHandler(wxMoveEvent& event);
#endif
void EnsureVisible(bool bOnlyHeadingBar = false)
{
wxDisplay display (this);
wxRect displayRect = display.GetClientArea();
@@ -171,14 +175,19 @@ namespace VeraCrypt
bool bMove = false;
wxPoint p = GetScreenPosition();
wxRect r = GetRect ();
if (p.x < displayRect.x)
wxRect rc = GetClientRect ();
int titleBarHeight = r.height - rc.height;
if (!bOnlyHeadingBar && (p.x < displayRect.x))
p.x = 0, bMove = true;
if (p.y < displayRect.y)
p.y = displayRect.y, bMove = true;
if (p.x + r.width > displayRect.x + displayRect.width)
if (!bOnlyHeadingBar && (p.x + r.width > displayRect.x + displayRect.width))
p.x = displayRect.x + displayRect.width - r.width, bMove = true;
if (p.y + r.height > displayRect.y + displayRect.height)
if (!bOnlyHeadingBar && (p.y + r.height > displayRect.y + displayRect.height))
p.y = displayRect.y + displayRect.height - r.height, bMove = true;
if (bOnlyHeadingBar && (p.y > (displayRect.y + displayRect.height - titleBarHeight)))
p.y = displayRect.y + displayRect.height - titleBarHeight, bMove = true;
if (bMove)
Move (p);
}