learning full-screen command

rstudio · Jan 30, 2013 · 543579f · 543579f
1 parent e09f131
commit 543579f
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 10 deletions.
diff --git a/src/cpp/session/resources/learning/slides.js b/src/cpp/session/resources/learning/slides.js
@@ -82,12 +82,3 @@ function revealEnterFullscreen() {
    }
 }
 
-// alt-click to zoom
-(function(){
-document.querySelector('.reveal').addEventListener('click', 
-                                                   function( event ) {
-   if (event.altKey) {
-	   event.preventDefault();
-	   revealEnterFullscreen();
-   }
-});
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.cmd.xml b/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.cmd.xml
@@ -907,7 +907,8 @@ well as menu structures (for main menu and popup menus).
    <!-- Learning -->
    <cmd id="refreshLearning"
         desc="Refresh the presentation"/>
-
+   <cmd id="learningFullscreen"
+        desc="Show slides in full screen mode"/>     
 
    <cmd id="historySendToSource"
         menuLabel="Insert into _Source"

diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.java b/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.java
@@ -159,6 +159,7 @@
 
    // Learning
    public abstract AppCommand refreshLearning();
+   public abstract AppCommand learningFullscreen();
 
    // View
    public abstract AppCommand showToolbar();

diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/commands/learningFullscreen.png b/src/gwt/src/org/rstudio/studio/client/workbench/commands/learningFullscreen.png
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/learning/LearningPane.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/learning/LearningPane.java
@@ -52,6 +52,8 @@ protected Toolbar createMainToolbar()
       titleLabel_ = new ToolbarLabel();
       toolbar.addLeftWidget(titleLabel_);
 
+      toolbar.addRightWidget(commands_.learningFullscreen().createToolbarButton());
+      toolbar.addRightSeparator();
       toolbar.addRightWidget(commands_.refreshLearning().createToolbarButton());
 
       return toolbar;
@@ -110,12 +112,24 @@ public boolean hasSlides()
       return !"about:blank".equals(href);
    }
 
+
+
    @Override
    public void refresh(boolean resetAnchor)
    {
       frame_.reload(resetAnchor);
    }
 
+   @Override
+   public void fullScreen()
+   {
+      enterFullscreen(frame_.getWindow());
+   }
+
+   public static final native void enterFullscreen(WindowEx window) /*-{
+      return window.revealEnterFullscreen();
+   }-*/;
+
    @Override
    public void next()
    {

diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/learning/LearningPresenter.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/learning/LearningPresenter.java
@@ -66,6 +66,7 @@ public interface Display extends WorkbenchView
       boolean hasSlides();
       void next();
       void prev();
+      void fullScreen();
       void refresh(boolean resetAnchor);
    }
 
@@ -142,6 +143,12 @@ public void onShowLearningPane(ShowLearningPaneEvent event)
       }
    }
 
+   @Handler
+   void onLearningFullscreen()
+   {
+      view_.fullScreen();
+   }
+
    @Handler
    void onRefreshLearning()
    {