Implement Fullscreen mode

etrunko · Nov 22, 2013 · d53d2e4 · kalyankondapally · Nov 23, 2013 · etrunko
1 parent 9cb6674
commit d53d2e4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/impl/ozone_display.cc b/impl/ozone_display.cc
@@ -243,8 +243,11 @@ void OzoneDisplay::OnWidgetStateChanged(gfx::AcceleratedWidget w,
       break;
     }
     case FullScreen:
-      NOTIMPLEMENTED();
+    {
+      WaylandWindow* widget = GetWidget(w);
+      widget->ToggleFullscreen();
       break;
+    }
     case Maximized:
     {
       WaylandWindow* widget = GetWidget(w);

diff --git a/wayland/shell_surface.cc b/wayland/shell_surface.cc
@@ -63,6 +63,10 @@ void WaylandShellSurface::UpdateShellSurface(WaylandWindow::ShellType type) cons
     wl_shell_surface_set_toplevel(shell_surface_);
     break;
   case WaylandWindow::FULLSCREEN:
+    wl_shell_surface_set_fullscreen(shell_surface_,
+                                    WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT,
+                                    0, NULL);
+    break;
   case WaylandWindow::TRANSIENT:
   case WaylandWindow::CUSTOM:
       NOTREACHED() << "UnSupported Shell Type.";

diff --git a/wayland/window.cc b/wayland/window.cc
@@ -45,14 +45,13 @@ void WaylandWindow::SetShellType(ShellType type)
     shell_surface_ = new WaylandShellSurface(this);
 
   type_ = type;
+
   switch (type_) {
     case TOPLEVEL:
-      shell_surface_->UpdateShellSurface(TOPLEVEL);
-      break;
     case MENU:
-      shell_surface_->UpdateShellSurface(MENU);
-      break;
     case FULLSCREEN:
+      shell_surface_->UpdateShellSurface(type_);
+      break;
     case TRANSIENT:
     case CUSTOM:
       NOTREACHED() << "UnSupported Shell Type.";
@@ -81,9 +80,12 @@ void WaylandWindow::Restore()
   NOTIMPLEMENTED();
 }
 
-void WaylandWindow::SetFullscreen()
+void WaylandWindow::ToggleFullscreen()
 {
-  NOTIMPLEMENTED();
+  if (type_ == FULLSCREEN)
+    SetShellType(TOPLEVEL);
+  else
+    SetShellType(FULLSCREEN);
 }
 
 void WaylandWindow::RealizeAcceleratedWidget()

diff --git a/wayland/window.h b/wayland/window.h
@@ -41,7 +41,7 @@ class WaylandWindow {
   void Maximize();
   void Minimize();
   void Restore();
-  void SetFullscreen();
+  void ToggleFullscreen();
 
   ShellType Type() const { return type_; }
   unsigned Handle() const { return handle_; }