Fix #256

Nash171 · Jan 7, 2013 · 839dd3d · 839dd3d
1 parent 4f5d1a8
commit 839dd3d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 10 deletions.
diff --git a/src/includes/cef.cpp b/src/includes/cef.cpp
@@ -10,6 +10,14 @@
 
 extern CefRefPtr<ClientHandler> g_handler;
 
+#if defined(__WIN__)
+DWMEFICA DwmExtendFrameIntoClientArea;
+DWMEBBW DwmEnableBlurBehindWindow;
+DWMWP DwmDefWindowProc;
+HMODULE dwmapiDLL;
+#endif
+
+
 namespace appjs {
 
 bool Cef::initialized_;

diff --git a/src/includes/cef.h b/src/includes/cef.h
@@ -34,10 +34,10 @@ typedef HRESULT (WINAPI *DWMEFICA)(HWND, MARGINS*);
 typedef HRESULT (WINAPI *DWMEBBW)(HWND, BLURBEHIND*);
 typedef BOOL (WINAPI *DWMWP)(HWND, UINT, WPARAM, LPARAM, LRESULT*);
 
-static DWMEFICA DwmExtendFrameIntoClientArea = NULL;
-static DWMEBBW DwmEnableBlurBehindWindow = NULL;
-static DWMWP DwmDefWindowProc = NULL;
-static HMODULE dwmapiDLL = NULL;
+extern DWMEFICA DwmExtendFrameIntoClientAreaL;
+extern DWMEBBW DwmEnableBlurBehindWindow;
+extern DWMWP DwmDefWindowProc;
+extern HMODULE dwmapiDLL;
 
 #endif
 

diff --git a/src/native_window/native_window.h b/src/native_window/native_window.h
@@ -134,7 +134,7 @@ class NativeWindow {
 
 #if defined(__WIN__)
   void SetStyle(long style, bool extended);
-  long GetStyle(bool extended);
+  long GetStyle(bool extended = false);
 
   //static void SetAppIcon(NW_ICONSIZE size, wchar_t* path);
   //void SetTitle(const wchar_t* title);

diff --git a/src/native_window/native_window_win.cpp b/src/native_window/native_window_win.cpp
@@ -16,6 +16,13 @@
 #define MAX_LOADSTRING 100
 #define SWP_STATECHANGED 0x8000
 
+#if defined(__WIN__)
+extern DWMEFICA DwmExtendFrameIntoClientArea;
+extern DWMEBBW DwmEnableBlurBehindWindow;
+extern DWMWP DwmDefWindowProc;
+extern HMODULE dwmapiDLL;
+#endif
+
 extern CefRefPtr<ClientHandler> g_handler;
 
 namespace appjs {
@@ -134,7 +141,9 @@ NativeWindow* NativeWindow::GetWindow(CefRefPtr<CefBrowser> browser){
 void AddWebView(CefWindowHandle parent, RECT windowRect, char* url, Settings* settings) {
   CefWindowInfo windowInfo;
   windowInfo.SetAsChild(parent, windowRect);
-  windowInfo.SetTransparentPainting(true);
+  if(settings->getBoolean("alpha",false)) {
+    windowInfo.SetTransparentPainting(true);
+  }
   g_handler->browserSettings_.web_security_disabled = settings->getBoolean("disableSecurity", false);
   CefBrowser::CreateBrowser(windowInfo, static_cast<CefRefPtr<CefClient>>(g_handler), url, g_handler->browserSettings_);
 }
@@ -181,7 +190,7 @@ void NativeWindow::Init(char* url, Settings* settings) {
     style |= WS_EX_TOOLWINDOW;
     style &= ~(WS_EX_APPWINDOW);
     ShowWindow(handle_, SW_HIDE); 
-    SetWindowLongPtr(handle_, GWL_EXSTYLE, style);  
+    SetWindowLongPtr(handle_, GWL_EXSTYLE, style);
     ShowWindow(handle_, SW_HIDE);
   }
 
@@ -200,7 +209,6 @@ void NativeWindow::Init(char* url, Settings* settings) {
 
   UpdateWindow(handle_);
 
-  Cef::Run();
 };
 
 
@@ -362,17 +370,20 @@ bool NativeWindow::GetResizable() {
 
 void NativeWindow::SetShowChrome(bool showChrome) {
   show_chrome_ = showChrome;
-  long current = GetWindowLongPtr(handle_, GWL_STYLE);
+  long current = GetStyle();
   NewStyle(handle_, GWL_STYLE, showChrome ? current | WS_CAPTION | WS_SIZEBOX : current & ~(WS_CAPTION | WS_SIZEBOX));
 }
 
 bool NativeWindow::GetShowChrome() {
-  long current = GetWindowLongPtr(handle_, GWL_STYLE);
+  long current = GetStyle();
   return (current & WS_CAPTION) || (current & WS_SIZEBOX);
 }
 
 void NativeWindow::SetAlpha(bool alpha) {
   alpha_ = alpha;
+  long current = GetStyle(TRUE);
+  SetStyle( alpha ? current | WS_EX_LAYERED | WS_EX_COMPOSITED : current & ~(WS_EX_LAYERED | WS_EX_COMPOSITED),TRUE);
+  BlurBehind(handle_, alpha);
   SetNCWidth(handle_, alpha ? -1 : 0);
 }