Update of /cvsroot/audacity/audacity-src/src/widgets
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv8645/widgets
Modified Files:
Tag: AUDACITY_1_2
ASlider.cpp Ruler.cpp
Log Message:
Fix font sizes on track label and rulers.
Index: ASlider.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/ASlider.cpp,v
retrieving revision 1.29.2.5
retrieving revision 1.29.2.6
diff -u -d -r1.29.2.5 -r1.29.2.6
--- ASlider.cpp 4 Jun 2006 10:12:54 -0000 1.29.2.5
+++ ASlider.cpp 12 Nov 2006 00:59:19 -0000 1.29.2.6
@@ -322,23 +322,22 @@
if (style == PAN_SLIDER)
{
- AColor::SetLabelFont(*dc);
-
- wxFont labelFont(sliderFontSize, wxSWISS, wxNORMAL, wxNORMAL);
- dc->SetFont(labelFont);
+ AColor::SetLabelFont(*dc);
/* i18n-hint: One-letter abbreviation for Left, in the Pan slider */
- dc->DrawText(_("L"), mLeftX, 1);
+ dc->DrawText(_("L"), mLeftX, 0);
+ int width, height;
/* i18n-hint: One-letter abbreviation for Right, in the Pan slider */
- dc->DrawText(_("R"), mRightX-7, 1);
+ dc->GetTextExtent(_("R"), &width, &height);
+ dc->DrawText(_("R"), mRightX-width+1, 0);
} else
{
// draw the '-' and the '+'
dc->SetPen(*wxBLACK_PEN);
dc->DrawLine(mLeftX, mCenterY-10, mLeftX+5, mCenterY-10);
- dc->DrawLine(mRightX-7, mCenterY-10, mRightX-2, mCenterY-10);
- dc->DrawLine(mRightX-5, mCenterY-12, mRightX-5, mCenterY-7);
+ dc->DrawLine(mRightX-5, mCenterY-10, mRightX+0, mCenterY-10);
+ dc->DrawLine(mRightX-3, mCenterY-12, mRightX-3, mCenterY-7);
}
delete dc;
Index: Ruler.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Ruler.cpp,v
retrieving revision 1.17.2.8
retrieving revision 1.17.2.9
diff -u -d -r1.17.2.8 -r1.17.2.9
--- Ruler.cpp 7 Nov 2006 02:28:27 -0000 1.17.2.8
+++ Ruler.cpp 12 Nov 2006 00:59:19 -0000 1.17.2.9
@@ -561,7 +561,7 @@
if (mFlip)
strTop = mTop + 4;
else
- strTop = mBottom - strH - 6;
+ strTop = mBottom - strH - 4;
}
else {
strLen = strH;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
