Implement Fullscreen mode

intel · Nov 27, 2013 · 1ee5ade · 1ee5ade
1 parent bf1dc26
commit 1ee5ade
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 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,11 @@ 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
@@ -67,9 +67,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_; }