commit 921091f29e2ecfec55f4d1ac5611b4aa4731e7d6
author yangsu@google.com <yangsu@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Aug 02 13:39:12 2011 +0000
committer yangsu@google.com <yangsu@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Aug 02 13:39:12 2011 +0000
tree b69f4dd41cb0f5db5be7fac4a26fdd9ddbbc5444
parent e938b19445155f71197aac003ea914f59645c471

Set up global options for SampleApp and now allows SampleApp to request menu items from the slides
http://codereview.appspot.com/4807056/


git-svn-id: http://skia.googlecode.com/svn/trunk@2024 2bbb7eff-a529-9590-31e7-b0007b416f81

samplecode/SampleApp.h

diff --git a/samplecode/SampleApp.h b/samplecode/SampleApp.h
index 43b9799..b3f3c93 100644
--- a/samplecode/SampleApp.h
+++ b/samplecode/SampleApp.h
@@ -18,6 +18,7 @@
 #include "SkTDArray.h"
 #include "SkTouchGesture.h"
 #include "SkWindow.h"
+#include "SkOSMenu.h"
 
 class GrContext;
 class GrRenderTarget;
@@ -29,9 +30,9 @@
 class SkData;
 
 enum SkTriState {
-    kFalse_SkTriState,
-    kTrue_SkTriState,
-    kUnknown_SkTriState,
+    kFalse_SkTriState = SkOSMenu::kOffState,
+    kTrue_SkTriState = SkOSMenu::kOnState,
+    kUnknown_SkTriState = SkOSMenu::kMixedState,
 };
 
 class SampleWindow : public SkOSWindow {
@@ -83,9 +84,11 @@
 
     virtual void draw(SkCanvas* canvas);
 
+    void setDeviceType(DeviceType type);
     void toggleRendering();
     void toggleSlideshow();
     void toggleFPS();
+    void togglePipe();
 
     GrContext* getGrContext() const { return fDevManager->getGrContext(); }
 
@@ -167,6 +170,11 @@
     int fScrollTestX, fScrollTestY;
     SkScalar fZoomCenterX, fZoomCenterY;
 
+    //Stores global settings
+    SkOSMenu fAppMenu;
+    //Stores slide specific settings
+    SkOSMenu fSlideMenu;
+    
     void loadView(SkView*);
     void updateTitle();