From e0f13eeb8e527cfd2541063ba2dd89c7d31d71ce Mon Sep 17 00:00:00 2001 From: "reed@android.com" Date: Wed, 4 Nov 2009 19:40:25 +0000 Subject: [PATCH] default to not showing the (slow) overview slide: hit DELETE to invoke git-svn-id: http://skia.googlecode.com/svn/trunk@417 2bbb7eff-a529-9590-31e7-b0007b416f81 --- samplecode/SampleApp.cpp | 8 +------- xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj | 10 +++++++++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 7ba069cca1..c485356b1f 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -10,8 +10,6 @@ #include "SampleCode.h" -#define SHOW_OVERVIEW false - SkView* create_overview(int, const SkViewFactory*); //#define SK_SUPPORT_GL @@ -231,11 +229,7 @@ SampleWindow::SampleWindow(void* hwnd) : INHERITED(hwnd) { } } fCurrIndex = 0; - if (SHOW_OVERVIEW) { - this->loadView(NULL); - } else { - this->loadView(fSamples[fCurrIndex]()); - } + this->loadView(fSamples[fCurrIndex]()); } SampleWindow::~SampleWindow() { diff --git a/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj b/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj index f79e1d5dc2..2a2a6473b8 100644 --- a/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj +++ b/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj @@ -72,6 +72,8 @@ 009230D8109F111F00AD3F12 /* OverView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009230D7109F111F00AD3F12 /* OverView.cpp */; }; 009490320FB0A5B90063C792 /* SampleLayerMask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009490310FB0A5B90063C792 /* SampleLayerMask.cpp */; }; 009887F1106142FC0020D19B /* SampleNinePatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0041CE310F00A12400695E8C /* SampleNinePatch.cpp */; }; + 00995E0E10A078E30054AD6D /* SkCubicInterval.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00995E0D10A078E30054AD6D /* SkCubicInterval.cpp */; }; + 00995E1610A079D80054AD6D /* SampleUnitMapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00995E1510A079D80054AD6D /* SampleUnitMapper.cpp */; }; 009CC9190F65918A002185BE /* SampleFontScalerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009CC9180F65918A002185BE /* SampleFontScalerTest.cpp */; }; 00A728270FD43D0400D5051F /* SampleMovie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2762F6760FCCCB01002BD8B4 /* SampleMovie.cpp */; }; 00A7282F0FD43D3700D5051F /* SkMovie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00A7282D0FD43D3700D5051F /* SkMovie.cpp */; }; @@ -231,6 +233,8 @@ 008C4D970F77DAEE0056981C /* SampleHairline.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleHairline.cpp; path = ../../samplecode/SampleHairline.cpp; sourceTree = SOURCE_ROOT; }; 009230D7109F111F00AD3F12 /* OverView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OverView.cpp; path = ../../samplecode/OverView.cpp; sourceTree = SOURCE_ROOT; }; 009490310FB0A5B90063C792 /* SampleLayerMask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleLayerMask.cpp; path = ../../samplecode/SampleLayerMask.cpp; sourceTree = SOURCE_ROOT; }; + 00995E0D10A078E30054AD6D /* SkCubicInterval.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkCubicInterval.cpp; path = ../../src/utils/SkCubicInterval.cpp; sourceTree = SOURCE_ROOT; }; + 00995E1510A079D80054AD6D /* SampleUnitMapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleUnitMapper.cpp; path = ../../samplecode/SampleUnitMapper.cpp; sourceTree = SOURCE_ROOT; }; 009CC9180F65918A002185BE /* SampleFontScalerTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleFontScalerTest.cpp; path = ../../samplecode/SampleFontScalerTest.cpp; sourceTree = SOURCE_ROOT; }; 00A41E4A0EFC312F00C9CBEB /* SampleArc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SampleArc.cpp; path = ../../samplecode/SampleArc.cpp; sourceTree = SOURCE_ROOT; }; 00A7282D0FD43D3700D5051F /* SkMovie.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkMovie.cpp; path = ../../src/images/SkMovie.cpp; sourceTree = SOURCE_ROOT; }; @@ -312,9 +316,11 @@ 007A7CB20F01658C00A2D6EE /* SampleXfermodes.cpp */, 0041CE1E0F00A12400695E8C /* SampleBitmapRect.cpp */, 008C4D970F77DAEE0056981C /* SampleHairline.cpp */, + 00995E0D10A078E30054AD6D /* SkCubicInterval.cpp */, 0041CE1F0F00A12400695E8C /* SampleCamera.cpp */, 0041CE200F00A12400695E8C /* SampleCircle.cpp */, 2794C04E0FE72903009AD112 /* SampleMipMap.cpp */, + 00995E1510A079D80054AD6D /* SampleUnitMapper.cpp */, 0041CE210F00A12400695E8C /* SampleCode.h */, 0041CE220F00A12400695E8C /* SampleCull.cpp */, 0041CE230F00A12400695E8C /* SampleDither.cpp */, @@ -337,7 +343,6 @@ 0041CE340F00A12400695E8C /* SamplePatch.cpp */, 0041CDDA0F00975E00695E8C /* SampleImageDir.cpp */, 00A41E4A0EFC312F00C9CBEB /* SampleArc.cpp */, - 00003C620EFC22A8000FF73A /* SampleApp.cpp */, 009230D7109F111F00AD3F12 /* OverView.cpp */, 00003C640EFC22A8000FF73A /* SamplePath.cpp */, 007C785D0F3B4C230004B142 /* SamplePathClip.cpp */, @@ -437,6 +442,7 @@ 00ED55F2104A10EB00F51FF8 /* StdWords.cpp */, 00EB4592104DBB18002B413E /* ForthTests.cpp */, 00BB289A104781D00057BF7E /* SampleForth.cpp */, + 00003C620EFC22A8000FF73A /* SampleApp.cpp */, 2762F66A0FCCCAA2002BD8B4 /* images */, 00003C6A0EFC22AD000FF73A /* views */, 00281C7B1083CFB700BCCB06 /* xml */, @@ -683,6 +689,8 @@ 00281D071084ED1200BCCB06 /* SkXMLParser_expat.cpp in Sources */, 009230D8109F111F00AD3F12 /* OverView.cpp in Sources */, 00403926109F22A800F2B5C5 /* SampleArc.cpp in Sources */, + 00995E0E10A078E30054AD6D /* SkCubicInterval.cpp in Sources */, + 00995E1610A079D80054AD6D /* SampleUnitMapper.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };