Added transitions and net pipe to SampleApp, updated gyp files
http://codereview.appspot.com/4839047/
http://codereview.appspot.com/4801080/
git-svn-id: http://skia.googlecode.com/svn/trunk@2059 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleApp.h b/samplecode/SampleApp.h
index b3f3c93..07c6452 100644
--- a/samplecode/SampleApp.h
+++ b/samplecode/SampleApp.h
@@ -29,12 +29,6 @@
class SkTypeface;
class SkData;
-enum SkTriState {
- kFalse_SkTriState = SkOSMenu::kOffState,
- kTrue_SkTriState = SkOSMenu::kOnState,
- kUnknown_SkTriState = SkOSMenu::kMixedState,
-};
-
class SampleWindow : public SkOSWindow {
SkTDArray<SkViewFactory> fSamples;
public:
@@ -89,6 +83,7 @@
void toggleSlideshow();
void toggleFPS();
void togglePipe();
+ void showOverview();
GrContext* getGrContext() const { return fDevManager->getGrContext(); }
@@ -152,7 +147,8 @@
bool fUsePipe;
bool fMeasureFPS;
SkMSec fMeasureFPS_Time;
-
+ bool fMagnify;
+
// The following are for the 'fatbits' drawing
// Latest position of the mouse.
int fMouseX, fMouseY;
@@ -160,11 +156,11 @@
// Used by the text showing position and color values.
SkTypeface* fTypeface;
bool fShowZoomer;
-
- SkTriState fLCDState;
- SkTriState fAAState;
- SkTriState fFilterState;
- SkTriState fHintingState;
+
+ SkOSMenu::TriState fLCDState;
+ SkOSMenu::TriState fAAState;
+ SkOSMenu::TriState fFilterState;
+ SkOSMenu::TriState fHintingState;
unsigned fFlipAxis;
int fScrollTestX, fScrollTestY;
@@ -174,14 +170,16 @@
SkOSMenu fAppMenu;
//Stores slide specific settings
SkOSMenu fSlideMenu;
+ int fTransitionNext;
+ int fTransitionPrev;
void loadView(SkView*);
void updateTitle();
- void toggleZoomer();
bool zoomIn();
bool zoomOut();
void updatePointer(int x, int y);
+ void magnify(SkCanvas* canvas);
void showZoomer(SkCanvas* canvas);
void postAnimatingEvent();