Transparency support in Mac OS X

trevorlinton · trevorlinton · commit 31afd7d428e7 · 2013-02-06T18:21:28.000-07:00
diff --git a/src/browser/native_window_mac.h b/src/browser/native_window_mac.h
@@ -60,10 +60,15 @@ class NativeWindowCocoa : public NativeWindow {
   virtual void SetPosition(const std::string& position) OVERRIDE;
   virtual void SetPosition(const gfx::Point& position) OVERRIDE;
   virtual gfx::Point GetPosition() OVERRIDE;
+  virtual gfx::Point GetMousePosition() OVERRIDE;
+  virtual void BeginOffclientMouseMove() OVERRIDE;
+  virtual void EndOffclientMouseMove() OVERRIDE;
   virtual void SetTitle(const std::string& title) OVERRIDE;
   virtual void FlashFrame(bool flash) OVERRIDE;
   virtual void SetKiosk(bool kiosk) OVERRIDE;
   virtual bool IsKiosk() OVERRIDE;
+  virtual void SetTransparent() OVERRIDE;
+  virtual bool IsTransparent() OVERRIDE;
   virtual void SetMenu(api::Menu* menu) OVERRIDE;
   virtual void SetToolbarButtonEnabled(TOOLBAR_BUTTON button,
                                        bool enabled) OVERRIDE;
@@ -107,6 +112,7 @@ class NativeWindowCocoa : public NativeWindow {
 
   bool is_fullscreen_;
   bool is_kiosk_;
+  bool is_transparent_;
   NSRect restored_bounds_;
 
   NSInteger attention_request_id_;  // identifier from requestUserAttention
diff --git a/src/browser/native_window_mac.mm b/src/browser/native_window_mac.mm
@@ -194,10 +194,13 @@ - (CGFloat)roundedCornerRadius;
 @interface ShellNSWindow : UnderlayOpenGLHostingWindow {
  @private
   content::Shell* shell_;
+  bool is_transparent_;
 }
 - (void)setShell:(content::Shell*)shell;
 - (void)showDevTools:(id)sender;
 - (void)closeAllWindows:(id)sender;
+- (void)setTransparent;
+- (BOOL)getTransparent;
 @end
 
 @implementation ShellNSWindow
@@ -214,6 +217,14 @@ - (void)closeAllWindows:(id)sender {
   api::App::CloseAllWindows();
 }
 
+- (void)setTransparent {
+  is_transparent_ = true;
+}
+
+- (BOOL)getTransparent {
+  return is_transparent_;
+}
+
 @end
 
 @interface ShellFramelessNSWindow : ShellNSWindow
@@ -231,15 +242,18 @@ - (void)drawCustomFrameRect:(NSRect)rect forView:(NSView*)view {
   [[NSColor clearColor] set];
   NSRectFill(rect);
 
-  // Set up our clip.
-  CGFloat cornerRadius = 4.0;
-  if ([view respondsToSelector:@selector(roundedCornerRadius)])
-    cornerRadius = [view roundedCornerRadius];
-  [[NSBezierPath bezierPathWithRoundedRect:[view bounds]
-                                   xRadius:cornerRadius
-                                   yRadius:cornerRadius] addClip];
-  [[NSColor whiteColor] set];
-  NSRectFill(rect);
+  if(![self getTransparent])
+  {
+    // Set up our clip.
+    CGFloat cornerRadius = 4.0;
+    if ([view respondsToSelector:@selector(roundedCornerRadius)])
+      cornerRadius = [view roundedCornerRadius];
+    [[NSBezierPath bezierPathWithRoundedRect:[view bounds]
+                                     xRadius:cornerRadius
+                                     yRadius:cornerRadius] addClip];
+    [[NSColor whiteColor] set];
+    NSRectFill(rect);
+  }
 }
 
 + (NSRect)frameRectForContentRect:(NSRect)contentRect
@@ -270,6 +284,7 @@ - (NSRect)contentRectForFrameRect:(NSRect)frameRect {
     : NativeWindow(shell, manifest),
       is_fullscreen_(false),
       is_kiosk_(false),
+      is_transparent_(false),
       attention_request_id_(0),
       use_system_drag_(true) {
   int width, height;
@@ -428,6 +443,24 @@ - (NSRect)contentRectForFrameRect:(NSRect)frameRect {
   return is_fullscreen_;
 }
 
+void NativeWindowCocoa::SetTransparent() {
+  is_transparent_ = true;
+  restored_bounds_ = [window() frame];
+  [window() setStyleMask:(NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)];
+  [window() setFrame:[window()
+                      frameRectForContentRect:[window() frame]]
+             display:YES];
+  [window() setHasShadow:NO];
+  ShellNSWindow* swin = (ShellNSWindow*)window();
+  [swin setTransparent];
+  [window() setOpaque:NO];
+  [window() setBackgroundColor:[NSColor clearColor]];
+}
+
+bool NativeWindowCocoa::IsTransparent() {
+  return is_transparent_;
+}
+
 void NativeWindowCocoa::SetNonLionFullscreen(bool fullscreen) {
   if (fullscreen == is_fullscreen_)
     return;
@@ -820,6 +853,21 @@ - (NSRect)contentRectForFrameRect:(NSRect)frameRect {
   }
 }
 
+gfx::Point NativeWindowCocoa::GetMousePosition() {
+  CGEventRef event = CGEventCreate(NULL);
+  CGPoint cursor = CGEventGetLocation(event);
+  CFRelease(event);
+  return gfx::Point(cursor.x,cursor.y);
+}
+
+void NativeWindowCocoa::BeginOffclientMouseMove() {
+  // Not implemented
+}
+
+void NativeWindowCocoa::EndOffclientMouseMove() {
+  // Not implemented
+}
+
 NativeWindow* CreateNativeWindowCocoa(content::Shell* shell,
                                            base::DictionaryValue* manifest) {
   return new NativeWindowCocoa(shell, manifest);
diff --git a/src/nw_shell.cc b/src/nw_shell.cc
@@ -315,16 +315,15 @@ bool Shell::OnMessageReceived(const IPC::Message& message) {
 }
 
 void Shell::RenderViewCreated(RenderViewHost* render_view_host) {
-  std::string transparent;
   if(window_->IsTransparent())
-  {
-    SkBitmap background;
-    background.setConfig(SkBitmap::kARGB_8888_Config, 1, 1);
-    background.allocPixels();
-    background.eraseARGB(0x00, 0x00, 0x00, 0x00);
-
-    content::RenderWidgetHostView* view = render_view_host->GetView();
-    DCHECK(view);
+  {
+    SkBitmap background;
+    background.setConfig(SkBitmap::kARGB_8888_Config, 1, 1);
+    background.allocPixels();
+    background.eraseARGB(0x00, 0x00, 0x00, 0x00);
+
+    content::RenderWidgetHostView* view = render_view_host->GetView();
+    DCHECK(view);
     view->SetBackground(background);
   }
 }
