[Win32] Fix issue with creating status icon before creating a window

Nash171 · Nov 6, 2012 · 79038e3 · 79038e3
1 parent 8b53576
commit 79038e3
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 40 deletions.
diff --git a/lib/App.js b/lib/App.js
@@ -55,7 +55,7 @@ inherit(App, EventEmitter, [
     }
 
     if(options.icon) {
-      options.icon = pathResolve(options.icon);
+      options.icon = pathResolve(__dirname,'../../../..',options.icon);
     }
 
     var self = this,

diff --git a/lib/menu.js b/lib/menu.js
@@ -50,7 +50,7 @@ var normalizeMnemonic = function(options){
 var normalize = function(options){
   for(i in options) {
     if(options[i].hasOwnProperty('icon')){
-      options[i]['icon'] = path.resolve(options[i]['icon']);
+      options[i]['icon'] = path.resolve(__dirname,'../../../..',options[i]['icon']);
     }
     normalize(options[i]['submenu']);
   }

diff --git a/src/includes/cef.cpp b/src/includes/cef.cpp
@@ -111,6 +111,19 @@ void Cef::Init(Settings* initOptions) {
     gtk_init(NULL,NULL);
 #endif
 
+#if defined(__WIN__)
+    dwmapiDLL = LoadLibrary(TEXT("dwmapi.dll"));
+    if (dwmapiDLL != NULL) {
+      DwmExtendFrameIntoClientArea = (DWMEFICA)GetProcAddress(dwmapiDLL, "DwmExtendFrameIntoClientArea");
+      DwmEnableBlurBehindWindow = (DWMEBBW)GetProcAddress(dwmapiDLL, "DwmEnableBlurBehindWindow");
+      DwmDefWindowProc = (DWMWP)GetProcAddress(dwmapiDLL, "DwmDefWindowProc");
+    }
+
+    Gdiplus::GdiplusStartupInput gdiplusStartupInput;
+    ULONG_PTR gdiplusToken;
+    Gdiplus::GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
+#endif
+
     Cef::initialized_ = true;
   }
 }

diff --git a/src/includes/cef.h b/src/includes/cef.h
@@ -5,8 +5,48 @@
 #include "util.h"
 #include "cef_loop.h"
 
+#ifdef __WIN__
+#include <windows.h>
+#include <algorithm>
+#define min(left,right) std::min(left,right)
+#define max(left,right) std::max(left,right)
+#include <gdiplus.h>
+#undef min
+#undef max
+#include <shlobj.h>
+#include <shlwapi.h>
+
+typedef struct _BLURBEHIND {
+  DWORD dwFlags;
+  BOOL  fEnable;
+  HRGN  hRgnBlur;
+  BOOL  fTransitionOnMaximized;
+} BLURBEHIND, *PBLURBEHIND;
+
+typedef struct _MARGINS {
+  int cxLeftWidth;
+  int cxRightWidth;
+  int cyTopHeight;
+  int cyBottomHeight;
+} MARGINS, *PMARGINS;
+
+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;
+
+#endif
+
 namespace appjs {
 
+// ###################################################
+// ### DWM functions that don't exist in WindowsXP ###
+// ###################################################
+
 class Cef : public CefLoop {
 
 public:

diff --git a/src/native_window/native_window_win.cpp b/src/native_window/native_window_win.cpp
@@ -32,34 +32,6 @@ HINSTANCE hInstance;
 char* url_;
 bool emitFullscreen = false;
 
-
-// ###################################################
-// ### DWM functions that don't exist in WindowsXP ###
-// ###################################################
-
-typedef struct _BLURBEHIND {
-  DWORD dwFlags;
-  BOOL  fEnable;
-  HRGN  hRgnBlur;
-  BOOL  fTransitionOnMaximized;
-} BLURBEHIND, *PBLURBEHIND;
-
-typedef struct _MARGINS {
-  int cxLeftWidth;
-  int cxRightWidth;
-  int cyTopHeight;
-  int cyBottomHeight;
-} MARGINS, *PMARGINS;
-
-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;
-
 // #################################
 // ### Windows Utility Functions ###
 // #################################
@@ -176,16 +148,6 @@ void NativeWindow::Init(char* url, Settings* settings) {
   url_ = url;
 
   if (is_main_window_) {
-    dwmapiDLL = LoadLibrary(TEXT("dwmapi.dll"));
-    if (dwmapiDLL != NULL) {
-      DwmExtendFrameIntoClientArea = (DWMEFICA)GetProcAddress(dwmapiDLL, "DwmExtendFrameIntoClientArea");
-      DwmEnableBlurBehindWindow = (DWMEBBW)GetProcAddress(dwmapiDLL, "DwmEnableBlurBehindWindow");
-      DwmDefWindowProc = (DWMWP)GetProcAddress(dwmapiDLL, "DwmDefWindowProc");
-    }
-
-    Gdiplus::GdiplusStartupInput gdiplusStartupInput;
-    ULONG_PTR gdiplusToken;
-    Gdiplus::GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
 
     TCHAR* wSmallIconPath = icons->getString("small", TEXT(""));
     TCHAR* wBigIconPath = icons->getString("big", TEXT(""));