github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-23 06:18:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

win: Fix window frame when DWM is disabled, closes #519.

Browse Source
This commit is contained in:
Cheng Zhao
2014-08-05 18:17:14 +08:00
parent 009e0790fe
commit a8cd101ff5
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
atom/browser/native_window_views.cc
View File

@@ -45,6 +45,7 @@
#elif defined(OS_WIN)
#include "atom/browser/ui/views/win_frame_view.h"
#include "base/win/scoped_comptr.h"
#include "ui/base/win/shell.h"
#endif
namespace atom {
@@ -480,9 +481,11 @@ views::ClientView* NativeWindowViews::CreateClientView(views::Widget* widget) {
views::NonClientFrameView* NativeWindowViews::CreateNonClientFrameView(
views::Widget* widget) {
#if defined(OS_WIN)
WinFrameView* frame_view = new WinFrameView;
frame_view->Init(this, widget);
return frame_view;
if (ui::win::IsAeroGlassEnabled()) {
WinFrameView* frame_view = new WinFrameView;
frame_view->Init(this, widget);
return frame_view;
}
#elif defined(OS_LINUX)
if (has_frame_) {
return new views::NativeFrameView(widget);
@@ -491,9 +494,9 @@ views::NonClientFrameView* NativeWindowViews::CreateNonClientFrameView(
frame_view->Init(this, widget);
return frame_view;
}
#else
return NULL;
#endif
return NULL;
}
void NativeWindowViews::HandleKeyboardEvent(