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

Disable autocreation of Xcode schemes

Browse Source
This commit is contained in:
Leland Lucius 2015-08-10 02:02:50 -05:00
parent 88f307626c
commit c15ca44eff
4 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -46,7 +46,6 @@
# Mac Specific # Mac Specific
.DS_Store .DS_Store
project.xcworkspace
xcuserdata xcuserdata
*.xcconfig *.xcconfig
mac/build mac/build

8
mac/Audacity.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
<false/>
</dict>
</plist>

2
src/AudacityApp.h
View File

@ -234,13 +234,11 @@ extern AudacityApp & wxGetApp();
#if defined(__WXMAC__) #if defined(__WXMAC__)
inline void EnableAntialiasing(wxDC & dc) inline void EnableAntialiasing(wxDC & dc)
{ {
dc.GetGraphicsContext()->EnableOffset(false);
dc.GetGraphicsContext()->SetAntialiasMode(wxANTIALIAS_DEFAULT); dc.GetGraphicsContext()->SetAntialiasMode(wxANTIALIAS_DEFAULT);
} }
inline void DisableAntialiasing(wxDC & dc) inline void DisableAntialiasing(wxDC & dc)
{ {
dc.GetGraphicsContext()->EnableOffset(true);
dc.GetGraphicsContext()->SetAntialiasMode(wxANTIALIAS_NONE); dc.GetGraphicsContext()->SetAntialiasMode(wxANTIALIAS_NONE);
} }

27
src/widgets/Ruler.cpp
View File

@ -136,14 +136,6 @@ Ruler::Ruler()
mUserFonts = false; mUserFonts = false;
#if !wxCHECK_VERSION(3, 0, 0)
#ifdef __WXMAC__
mMinorMinorFont->SetNoAntiAliasing(true);
mMinorFont->SetNoAntiAliasing(true);
mMajorFont->SetNoAntiAliasing(true);
#endif
#endif
mMajorLabels = 0; mMajorLabels = 0;
mMinorLabels = 0; mMinorLabels = 0;
mMinorMinorLabels = 0; mMinorMinorLabels = 0;
@ -314,14 +306,6 @@ void Ruler::SetFonts(const wxFont &minorFont, const wxFont &majorFont, const wxF
*mMinorFont = minorFont; *mMinorFont = minorFont;
*mMajorFont = majorFont; *mMajorFont = majorFont;
#if !wxCHECK_VERSION(3, 0, 0)
#ifdef __WXMAC__
mMinorMinorFont->SetNoAntiAliasing(true);
mMinorFont->SetNoAntiAliasing(true);
mMajorFont->SetNoAntiAliasing(true);
#endif
#endif
// Won't override these fonts // Won't override these fonts
mUserFonts = true; mUserFonts = true;
@ -1015,15 +999,18 @@ void Ruler::Update(TimeTrack* timetrack)// Envelope *speedEnv, long minSpeed, lo
desiredPixelHeight = 10;//8; desiredPixelHeight = 10;//8;
if (desiredPixelHeight > 12) if (desiredPixelHeight > 12)
desiredPixelHeight = 12; desiredPixelHeight = 12;
printf("desired h %d\n", desiredPixelHeight);
// Keep making the font bigger until it's too big, then subtract one. // Keep making the font bigger until it's too big, then subtract one.
mDC->SetFont(wxFont(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD)); mDC->SetFont(wxFont(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD));
mDC->GetTextExtent(exampleText, &strW, &strH, &strD, &strL); mDC->GetTextExtent(exampleText, &strW, &strH, &strD, &strL);
printf("strW %d h %d d %d l %d\n", strW, strH, strD, strL);
while ((strH - strD - strL) <= desiredPixelHeight && fontSize < 40) { while ((strH - strD - strL) <= desiredPixelHeight && fontSize < 40) {
fontSize++; fontSize++;
mDC->SetFont(wxFont(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD)); mDC->SetFont(wxFont(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD));
mDC->GetTextExtent(exampleText, &strW, &strH, &strD, &strL); mDC->GetTextExtent(exampleText, &strW, &strH, &strD, &strL);
printf("size %d strW %d h %d d %d l %d\n", fontSize, strW, strH, strD, strL);
} }
printf("fontSize = %d\n", fontSize);
fontSize--; fontSize--;
mDC->SetFont(wxFont(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); mDC->SetFont(wxFont(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL));
mDC->GetTextExtent(exampleText, &strW, &strH, &strD, &strL); mDC->GetTextExtent(exampleText, &strW, &strH, &strD, &strL);
@ -1608,7 +1595,7 @@ void Ruler::SetUseZoomInfo(int leftOffset)
// //
BEGIN_EVENT_TABLE(RulerPanel, wxPanel) BEGIN_EVENT_TABLE(RulerPanel, wxPanel)
EVT_ERASE_BACKGROUND(RulerPanel::OnErase) // EVT_ERASE_BACKGROUND(RulerPanel::OnErase)
EVT_PAINT(RulerPanel::OnPaint) EVT_PAINT(RulerPanel::OnPaint)
EVT_SIZE(RulerPanel::OnSize) EVT_SIZE(RulerPanel::OnSize)
END_EVENT_TABLE() END_EVENT_TABLE()
@ -1620,6 +1607,7 @@ RulerPanel::RulerPanel(wxWindow* parent, wxWindowID id,
const wxSize& size /*= wxDefaultSize*/): const wxSize& size /*= wxDefaultSize*/):
wxPanel(parent, id, pos, size) wxPanel(parent, id, pos, size)
{ {
SetBackgroundStyle(wxBG_STYLE_PAINT);
} }
RulerPanel::~RulerPanel() RulerPanel::~RulerPanel()
@ -1683,7 +1671,6 @@ enum {
}; };
BEGIN_EVENT_TABLE(AdornedRulerPanel, wxPanel) BEGIN_EVENT_TABLE(AdornedRulerPanel, wxPanel)
EVT_ERASE_BACKGROUND(AdornedRulerPanel::OnErase)
EVT_PAINT(AdornedRulerPanel::OnPaint) EVT_PAINT(AdornedRulerPanel::OnPaint)
EVT_SIZE(AdornedRulerPanel::OnSize) EVT_SIZE(AdornedRulerPanel::OnSize)
EVT_MOUSE_EVENTS(AdornedRulerPanel::OnMouseEvents) EVT_MOUSE_EVENTS(AdornedRulerPanel::OnMouseEvents)
@ -1836,7 +1823,7 @@ void AdornedRulerPanel::OnErase(wxEraseEvent & WXUNUSED(evt))
void AdornedRulerPanel::OnPaint(wxPaintEvent & WXUNUSED(evt)) void AdornedRulerPanel::OnPaint(wxPaintEvent & WXUNUSED(evt))
{ {
wxBufferedPaintDC dc(this); wxAutoBufferedPaintDC dc(this);
DoDrawBorder(&dc); DoDrawBorder(&dc);