Update of /cvsroot/audacity/audacity-src/src/widgets
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv8831
Modified Files:
Ruler.cpp
Log Message:
Infinite loop fixed, see audacity-devel at this date, subject 'Rulers (again)'.
Index: Ruler.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Ruler.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- Ruler.cpp 19 Apr 2008 22:08:15 -0000 1.50
+++ Ruler.cpp 29 Jun 2008 23:25:35 -0000 1.51
@@ -859,7 +859,13 @@
if (mOrientation == wxHORIZONTAL)
desiredPixelHeight = mBottom-mTop-5; // height less ticks and 1px gap
else
+ {
+#ifdef EXPERIMENTAL_RULER_AUTOSIZE
+ desiredPixelHeight = 12; // why 12? 10 -> 12 seems to be max/min
+#else
desiredPixelHeight = (mRight-mLeft)/2;
+#endif //EXPERIMENTAL_RULER_AUTOSIZE
+ }
#ifdef EXPERIMENTAL_RULER_AUTOSIZE
if (desiredPixelHeight < 10)//8)
@@ -964,7 +970,7 @@
if (mLabelEdges) {
#ifdef EXPERIMENTAL_RULER_AUTOSIZE
Tick(0, mMin, true, false);
- Tick(0, mMin, true, false);
+ Tick(mLength, mMax, true, false);
#else //!EXPERIMENTAL_RULER_AUTOSIZE
Tick(0, mMin, true);
Tick(mLength, mMax, true);
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
