[re] final Disapearing Window patch
|
|
Please find attached fixFinalDisapWindow.patch, it is an update to the
patch I sent this morning--use this one. One tiny behavior change was made--when cascading and marching windows eventually automatically reduced in size to an unacceptable level, I chose to use the user's most recently stored prefs values (if available) instead of the defaultWindow value for the new window's size and location. I also did a lot of housecleaning--I was calling the same function to get unchanging data every pass through nested for-loops. I moved all of them out of the loops. I also switched to "break" instead of manually trying to set the loop counter out-of-bounds--much cleaner and I had had problems with the calculations being off-by-one yesterday). --Ed ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ audacity-devel mailing list [hidden email] https://lists.sourceforge.net/lists/listinfo/audacity-devel |
||||||||
fixFinalDisapWindow.patch (25K)
|
|
||||||||
|
|
|
||||||||
|
In reply to this post
by Ed Musgrove-2
|
||||||||
|
|
|
||||||||
|
|
|
||||||||
|
|
In reply to this post
by Ed Musgrove-2
|
||||||||
|
|
|
||||||||
|
|
|
||||||||
|
In reply to this post
by Ed Musgrove-2
|
||||||||
|
|
Hi Leland!
Unfortunately, I have not been able to get anyone to apply the most current patch (I do not have commit permission and probably have not earned it). Within the last few minutes I downloaded the CVS HEAD then made all of my final changes to that source code. Attached please find GNWP.patch which, when applied, will address the issues you note below. I was taught to insert comments (telling why, not necessarily how) so I have been doing so in the Audacity source code which I modified. I have also been dating in signing any major changes that I made. I have been asked to remove these comments so I've done so for the patch. Could I impose on you to apply this patch? It has been reasonably well beta tested on XP, Vista, Windows 7, Mac (Intel not PPC) and at least one version of Linux. Find attached a text file (source with comments.txt) with the pertinent code, comments left intact. Here are the instructions I have given the beta testers: *Open your audacity.cfg file (I don't know where it is on Linux) delete all but the first line. *Run Audacity. The project window should open in the default position. *Open a new project. This new project window should open slightly to the right and slightly down (cascade-style 25 pixels right and 25 pixels down). Unless the original project window was very wide or tall this new project window should be the same size. *Open a few more new projects. They should continue cascading but when either edge (bottom or right) reach the screen edge the behavior should change. When a new project window's right edge would go off the screen, that new window's width is reduced to keep it on screen. One a new project window's bottom edge would go off the screen, that new window's top edge is moved up so that it is level with the previous project window (marching-style 25 pixels right and 0 pixels down). Eventually, when you've created enough new project windows, the resulting new window would be smaller than the minimum that Audacity allows. At that point the next new project window will be created at the user's stored preferred location but will maintain the height of the previous project window. *Close all but one of the project Windows. *Move and resize that window so that it is obviously different from the default window which opened initially. *Close Audacity. *Restart Audacity. The resulting new project window should open in the same size and location as it was when you just quit Audacity. *Move and resize that window so that it is again obviously different from the default window and from the condition in which it just opened. *Maximize that project window. *Close Audacity. *Restart Audacity. The resulting new project window should open maximized. *Restore down that project window. It should return to the size and location it was in when you close audacity the last time. *Try anything that you can think of to confuse Audacity about window location! A word of warning, at some point Audacity blows up after creating a large number of new projects. The number of new projects that a user may create seems to be highly dependent upon the operating system (XP allows about 24, Vista allows about 36, Mac and Linux allow about 80). If you get to this condition you will need to use the operating system or the debugger to exit the program. --Ed > -----Original Message----- > From: Leland [mailto:[hidden email]] > Sent: Saturday, November 07, 2009 4:51 PM > To: [hidden email] > Subject: Re: [Audacity-devel] [re] final Disapearing Window patch > > Hi Ed, > > I'm working on a loop on the Mac and I was wondering if you could give me a > hint as to what the "for (int i...)" and "for (int j...)" loops in > GetNextWindowPlacement() are doing? Except for the 3rd one, they all > appear to do the same thing. (Be gentle if I missed something obvious.) > > The 3rd one (the "+-" case) is the one that's causing a loop on the Mac. > Consider the following: > > targetLeft = 14; > targetRight = 178; > targetTop = -1; > targetBottom = 13 > > These values cause the "+-" case and since j is decremented from "-1", it > takes a VERY long time to get to targetBottom. > > Leland > > Ed Musgrove wrote: > > Please find attached fixFinalDisapWindow.patch, it is an update to > > the patch I sent this morning--use this one. > > > > One tiny behavior change was made--when cascading and marching > windows > > eventually automatically reduced in size to an unacceptable level, I > > chose to use the user's most recently stored prefs values (if > > available) instead of the defaultWindow value for the new window's size > and location. > > > > I also did a lot of housecleaning--I was calling the same function to > > get unchanging data every pass through nested for-loops. I moved all > > of them out of the loops. I also switched to "break" instead of > > manually trying to set the loop counter out-of-bounds--much cleaner > > and I had had problems with the calculations being off-by-one > > > > --Ed > > > > > > > > ---------------------------------------------------------------------- > > -- > > > > ---------------------------------------------------------------------- > > -------- Come build with us! The BlackBerry(R) Developer Conference in > > SF, CA is the only developer event you need to attend this year. > > Jumpstart your developing skills, take BlackBerry mobile applications > > to market and stay ahead of the curve. Join us from November 9 - 12, > > 2009. Register now! > > http://p.sf.net/sfu/devconference > > > > > > ---------------------------------------------------------------------- > > -- > > > > _______________________________________________ > > audacity-devel mailing list > > [hidden email] > > https://lists.sourceforge.net/lists/listinfo/audacity-devel > > > > Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day > trial. Simplify your report design, integration and deployment - and focus on > what you do best, core application coding. Discover what's new with Crystal > Reports now. http://p.sf.net/sfu/bobj-july > _______________________________________________ > audacity-devel mailing list > [hidden email] > https://lists.sourceforge.net/lists/listinfo/audacity-devel bool IsWindowAssessable(wxRect *requestedRect) { // define a rectangular region of the window's title bar and determine if any portion // of it is in the desktopand is therefor available to be dragged by the use // this will insure that the new window is always accessible to the user wxMessageBox("iwa"); /*efm5*/ wxDisplay display; wxRect targetTitleRect(requestedRect->GetLeftTop(), requestedRect->GetBottomRight()); targetTitleRect.x += 15; // ignore title bar icon region targetTitleRect.width -= 100; // ignore min max & close icons if (targetTitleRect.width < 165) targetTitleRect.width = 165; // 165 pixels of window width to grab a hold of targetTitleRect.height = 15; // 15 pixels of window height to grab a hold of int targetBottom = targetTitleRect.GetBottom(); int targetRight = targetTitleRect.GetRight(); for (int i = targetTitleRect.GetLeft(); i < targetRight; i++) { for (int j = targetTitleRect.GetTop(); j < targetBottom; j++) { int monitor = display.GetFromPoint(wxPoint(i, j)); if (monitor != wxNOT_FOUND) { return TRUE; } } } return FALSE; } // BG: Calculate where to place the next window (could be the first window) // BG: Does not store X and Y in prefs. This is intentional. void GetNextWindowPlacement(wxRect *nextRect, bool *pMaximized, bool *pIconized) { // This code was heavily modified to deal with iconized // and maximized project windows // Ed Musgrove // 28 September 2009 -- 21 October 2009 int inc = 25; *pMaximized = FALSE; *pIconized = FALSE; wxRect defaultWindowRect; GetDefaultWindowRect(&defaultWindowRect); if (gAudacityProjects.IsEmpty()) { //Read the values from the registry, or use the defaults // In version 1.3 and above, using the registry has been replaced // by a configuration file -- audacity.cfg. Different OSes store // this file in different locations. gPrefs->Read(wxT("/Window/Maximized"), pMaximized); gPrefs->Read(wxT("/Window/Iconized"), pIconized); if (pMaximized || pIconized) { nextRect->SetX(gPrefs->Read(wxT("/Window/Normal_X"), defaultWindowRect.GetX())); nextRect->SetY(gPrefs->Read(wxT("/Window/Normal_Y"), defaultWindowRect.GetY())); nextRect->SetWidth(gPrefs->Read(wxT("/Window/Normal_Width"), defaultWindowRect.GetWidth())); nextRect->SetHeight(gPrefs->Read(wxT("/Window/Normal_Height"), defaultWindowRect.GetHeight())); } else { nextRect->SetX(gPrefs->Read(wxT("/Window/X"), defaultWindowRect.GetX())); nextRect->SetY(gPrefs->Read(wxT("/Window/Y"), defaultWindowRect.GetY())); nextRect->SetWidth(gPrefs->Read(wxT("/Window/Width"), defaultWindowRect.GetWidth())); nextRect->SetHeight(gPrefs->Read(wxT("/Window/Height"), defaultWindowRect.GetHeight())); } if (!IsWindowAssessable(nextRect)) { // the default values are guaranteed to be on the main monitor // completely visible and accessible nextRect->SetX(defaultWindowRect.GetX()); nextRect->SetY(defaultWindowRect.GetY()); nextRect->SetWidth(defaultWindowRect.GetWidth()); nextRect->SetHeight(defaultWindowRect.GetHeight()); } } else { bool validWindowSize = FALSE; AudacityProject * validProject = NULL; size_t numProjects = gAudacityProjects.Count(); for (int i = numProjects; i > 0 ; i--) // read these backwards so that new project locations will increment off the newest project window { if (!gAudacityProjects[i-1]->IsIconized()) { validWindowSize = TRUE; validProject = gAudacityProjects[i-1]; i = 0; } } if (validWindowSize) { *nextRect = validProject->GetRect(); *pMaximized = validProject->IsMaximized(); *pIconized = validProject->IsIconized(); } else { nextRect->SetX(gPrefs->Read(wxT("/Window/Normal_X"), defaultWindowRect.GetX())); nextRect->SetY(gPrefs->Read(wxT("/Window/Normal_Y"), defaultWindowRect.GetY())); nextRect->SetWidth(gPrefs->Read(wxT("/Window/Normal_Width"), defaultWindowRect.GetWidth())); nextRect->SetHeight(gPrefs->Read(wxT("/Window/Normal_Height"), defaultWindowRect.GetHeight())); gPrefs->Read(wxT("/Window/Maximized"), pMaximized); gPrefs->Read(wxT("/Window/Iconized"), pIconized); } //Placement depends on the increments nextRect->SetX(nextRect->GetX() + inc); //nextRect->x += inc; nextRect->SetY(nextRect->GetY() + inc); //nextRect->y += inc; } //Make sure that the Window will be completely visible //Get the size of the screen wxRect screenRect = wxGetClientDisplayRect(); // We do not want to reset the increments unless the top left corner of the new window // gets too near the bottom right hand corner of the screen -- also, make sure the // window fits on the screen // Ed Musgrove // 16 October 2009 //Have we hit the right side of the screen? wxPoint bottomRight = nextRect->GetBottomRight(); if (bottomRight.x > screenRect.GetRight()) { int newWidth = screenRect.GetWidth() - nextRect->GetLeft(); if (newWidth < defaultWindowRect.GetWidth()) { // try to use as much of the user's preferred Project window state as possible nextRect->SetX(gPrefs->Read(wxT("/Window/X"), defaultWindowRect.GetX())); nextRect->SetY(gPrefs->Read(wxT("/Window/Y"), defaultWindowRect.GetY())); nextRect->SetWidth(gPrefs->Read(wxT("/Window/Width"), defaultWindowRect.GetWidth())); } else { nextRect->SetWidth(newWidth); } } bottomRight = nextRect->GetBottomRight(); //Have we hit the bottom of the screen? if (bottomRight.y > screenRect.GetBottom()) { nextRect->y -= inc; //we will need to test again since we have moved the window down bottomRight = nextRect->GetBottomRight(); if (bottomRight.y > screenRect.GetBottom()) { int newheight = screenRect.GetHeight() - nextRect->GetBottom(); nextRect->SetBottom(screenRect.GetBottom()); } } if (!IsWindowAssessable(nextRect)) { // the default values are guaranteed to be on the main monitor // completely visible and accessible nextRect->SetX(defaultWindowRect.GetX()); nextRect->SetY(defaultWindowRect.GetY()); nextRect->SetWidth(defaultWindowRect.GetWidth()); nextRect->SetHeight(defaultWindowRect.GetHeight()); } } ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ audacity-devel mailing list [hidden email] https://lists.sourceforge.net/lists/listinfo/audacity-devel |
||||||||
|
|
|
||||||||
|
|
In reply to this post
by Ed Musgrove-2
|
||||||||
|
|
|
||||||||
|
|
|
||||||||
|
|
|
||||||||
|
|
|
||||||||
|
|
|
||||||||
| Free Embeddable Forum Powered by Nabble | Help |
