Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-16 16:10:06 +02:00
Code Issues Releases Wiki Activity

Ensure the project window doesn't fall underneath the menu on OSX

Browse Source
This commit is contained in:
Leland Lucius 2015-08-17 02:12:55 -05:00
parent bb553a1cfb
commit 13dbaf11ec
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Project.cpp
View File

@ -618,7 +618,8 @@ void GetNextWindowPlacement(wxRect *nextRect, bool *pMaximized, bool *pIconized)
gPrefs->Read(wxT("/Window/Normal_Width"), &normalRect.width, defaultRect.width);
gPrefs->Read(wxT("/Window/Normal_Height"), &normalRect.height, defaultRect.height);
// Workaround 2.1.1 and earlier bug on OSX...affects only normalRect, but be safe
// Workaround 2.1.1 and earlier bug on OSX...affects only normalRect, but let's just
// validate for all rects and plats
if (normalRect.width == 0 || normalRect.height == 0) {
normalRect = defaultRect;
}
@ -626,6 +627,17 @@ void GetNextWindowPlacement(wxRect *nextRect, bool *pMaximized, bool *pIconized)
windowRect = defaultRect;
}
#if defined(__WXMAC__)
// On OSX, the top of the window should never be less than the menu height,
// so something is amiss if it is
if (normalRect.y < defaultRect.y) {
normalRect = defaultRect;
}
if (windowRect.y < defaultRect.y) {
windowRect = defaultRect;
}
#endif
if (gAudacityProjects.IsEmpty()) {
if (*pMaximized || *pIconized) {
*nextRect = normalRect;