Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv15574
Modified Files:
Menus.cpp Menus.h Project.cpp
Log Message:
Rename AudacityProject::OnZoomFitV_Calc() to DoZoomFitV() because it's not just
doing calculation, it's changing the heights, and it's not an event handler (so
"On-" is inapprorpriate.
This answers an "ANSWER ME" comment in one of the callers.
Also moved that call lower in AudacityProject::PushState(), to match similar
calls in Audiotouch custom version (to be ported) and because it was in the
middle of something to which it was irrelevant.
Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -d -r1.328 -r1.329
--- Project.cpp 19 Sep 2007 07:11:48 -0000 1.328
+++ Project.cpp 20 Sep 2007 23:15:58 -0000 1.329
@@ -2689,11 +2689,6 @@
bool consolidate)
{
TrackList *l = new TrackList(mTracks);
-
- //ANSWER-ME: What's the zoom-fit calc for?
- if (GetTracksFitVerticallyZoomed() == true) {
- OnZoomFitV_Calc();
- }
mUndoManager.PushState(l, mViewInfo.sel0, mViewInfo.sel1,
desc, shortDesc, consolidate);
delete l;
@@ -2707,6 +2702,9 @@
UpdateMenus();
+ if (GetTracksFitVerticallyZoomed())
+ this->DoZoomFitV();
+
AutoSaveIfNeeded();
}
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -d -r1.343 -r1.344
--- Menus.cpp 18 Sep 2007 11:49:26 -0000 1.343
+++ Menus.cpp 20 Sep 2007 23:15:57 -0000 1.344
@@ -3229,7 +3229,7 @@
TP_ScrollWindow(0.0);
}
-void AudacityProject::OnZoomFitV_Calc()
+void AudacityProject::DoZoomFitV()
{
int width, height, count;
@@ -3268,7 +3268,7 @@
void AudacityProject::OnZoomFitV()
{
- OnZoomFitV_Calc();
+ this->DoZoomFitV();
mVsbar->SetThumbPosition(0);
RedrawProject();
Index: Menus.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.h,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- Menus.h 18 Sep 2007 11:49:26 -0000 1.111
+++ Menus.h 20 Sep 2007 23:15:58 -0000 1.112
@@ -188,7 +188,7 @@
void OnZoomNormal();
void OnZoomFit();
void OnZoomFitV();
-void OnZoomFitV_Calc();
+void DoZoomFitV();
void OnZoomSel();
void OnExpandAllTracks();
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
