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

win: Add toolbar type for BrowserWindow

Browse source
This commit is contained in:
Cheng Zhao 2016-07-11 12:46:50 +09:00
parent c644353726
commit e8e2763131
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
atom/browser/native_window_views.cc
View file

@ -224,6 +224,9 @@ NativeWindowViews::NativeWindowViews(
bool fullscreen = false; bool fullscreen = false;
options.Get(options::kFullscreen, &fullscreen); options.Get(options::kFullscreen, &fullscreen);
std::string window_type;
options.Get(options::kType, &window_type);
#if defined(USE_X11) #if defined(USE_X11)
// Start monitoring window states. // Start monitoring window states.
window_state_watcher_.reset(new WindowStateWatcher(this)); window_state_watcher_.reset(new WindowStateWatcher(this));
@ -253,9 +256,6 @@ NativeWindowViews::NativeWindowViews(
state_atom_list.push_back(GetAtom("_NET_WM_STATE_FULLSCREEN")); state_atom_list.push_back(GetAtom("_NET_WM_STATE_FULLSCREEN"));
} }
std::string window_type;
options.Get(options::kType, &window_type);
if (parent) { if (parent) {
SetParentWindow(parent); SetParentWindow(parent);
// Force using dialog type for child window. // Force using dialog type for child window.
@ -295,12 +295,13 @@ NativeWindowViews::NativeWindowViews(
::SetWindowLong(GetAcceleratedWidget(), GWL_STYLE, frame_style); ::SetWindowLong(GetAcceleratedWidget(), GWL_STYLE, frame_style);
} }
if (!thick_frame_) { LONG ex_style = ::GetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE);
// Window without thick frame has to have WS_EX_COMPOSITED style. // Window without thick frame has to have WS_EX_COMPOSITED style.
LONG ex_style = ::GetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE); if (!thick_frame_)
ex_style |= WS_EX_COMPOSITED; ex_style |= WS_EX_COMPOSITED;
::SetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE, ex_style); if (window_type == "toolbar")
} ex_style |= WS_EX_TOOLWINDOW;
::SetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE, ex_style);
#endif #endif
// TODO(zcbenz): This was used to force using native frame on Windows 2003, we // TODO(zcbenz): This was used to force using native frame on Windows 2003, we

1
docs/api/browser-window.md
View file

@ -197,6 +197,7 @@ supported values are:
(`kCGDesktopWindowLevel - 1`). Note that desktop window will not receive (`kCGDesktopWindowLevel - 1`). Note that desktop window will not receive
focus, keyboard or mouse events, but you can use `globalShortcut` to receive focus, keyboard or mouse events, but you can use `globalShortcut` to receive
input sparingly. input sparingly.
* On Windows, possible types are `toolbar`,
The `titleBarStyle` option is only supported on macOS 10.10 Yosemite and newer. The `titleBarStyle` option is only supported on macOS 10.10 Yosemite and newer.
Possible values are: Possible values are: