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

linux: Use native window frame.

Browse source
This commit is contained in:
Cheng Zhao 2014-07-24 18:06:27 +08:00
parent 640ac43059
commit 11634740d3
1 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

39
atom/browser/native_window_views.cc
View file

@ -33,7 +33,8 @@
#if defined(USE_X11) #if defined(USE_X11)
#include "atom/browser/ui/views/global_menu_bar_x11.h" #include "atom/browser/ui/views/global_menu_bar_x11.h"
#include "atom/browser/ui/views/linux_frame_view.h" #include "atom/browser/ui/views/frameless_view.h"
#include "ui/views/window/native_frame_view.h"
#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"
@ -90,14 +91,7 @@ NativeWindowViews::NativeWindowViews(content::WebContents* web_contents,
params.delegate = this; params.delegate = this;
params.type = views::Widget::InitParams::TYPE_WINDOW; params.type = views::Widget::InitParams::TYPE_WINDOW;
params.top_level = true; params.top_level = true;
params.remove_standard_frame = !has_frame_;
#if defined(USE_X11)
// In X11 the window frame is drawn by the application.
params.remove_standard_frame = true;
#elif defined(OS_WIN)
if (!has_frame_)
params.remove_standard_frame = true;
#endif
#if defined(USE_X11) #if defined(USE_X11)
// FIXME Find out how to do this dynamically on Linux. // FIXME Find out how to do this dynamically on Linux.
@ -221,6 +215,17 @@ gfx::Size NativeWindowViews::GetContentSize() {
void NativeWindowViews::SetMinimumSize(const gfx::Size& size) { void NativeWindowViews::SetMinimumSize(const gfx::Size& size) {
minimum_size_ = size; minimum_size_ = size;
#if defined(USE_X11)
XSizeHints size_hints;
size_hints.flags = PPosition | PWinGravity;
size_hints.x = bounds_.x();
size_hints.y = bounds_.y();
// Set StaticGravity so that the window position is not affected by the
// frame width when running with window manager.
size_hints.win_gravity = StaticGravity;
XSetWMNormalHints(xdisplay_, xwindow_, &size_hints);
#endif
} }
gfx::Size NativeWindowViews::GetMinimumSize() { gfx::Size NativeWindowViews::GetMinimumSize() {
@ -442,13 +447,21 @@ views::ClientView* NativeWindowViews::CreateClientView(views::Widget* widget) {
views::NonClientFrameView* NativeWindowViews::CreateNonClientFrameView( views::NonClientFrameView* NativeWindowViews::CreateNonClientFrameView(
views::Widget* widget) { views::Widget* widget) {
#if defined(USE_X11) #if defined(OS_WIN)
LinuxFrameView* frame_view = new LinuxFrameView;
#else
WinFrameView* frame_view = new WinFrameView; WinFrameView* frame_view = new WinFrameView;
#endif
frame_view->Init(this, widget); frame_view->Init(this, widget);
return frame_view; return frame_view;
#elif defined(OS_LINUX)
if (has_frame_) {
return new views::NativeFrameView(widget);
} else {
FramelessView* frame_view = new FramelessView;
frame_view->Init(this, widget);
return frame_view;
}
#else
return NULL;
#endif
} }
void NativeWindowViews::HandleKeyboardEvent( void NativeWindowViews::HandleKeyboardEvent(