mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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