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

window: use _NET_WM_STATE_FULLSCREEN before window is mapped

Browse source
This commit is contained in:
Robo 2015-06-29 19:23:33 +05:30
parent ebfbbc0801
commit b5c5cce725
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/native_window.cc
View file

@ -189,10 +189,12 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
if (options.Get(switches::kAlwaysOnTop, &top) && top) { if (options.Get(switches::kAlwaysOnTop, &top) && top) {
SetAlwaysOnTop(true); SetAlwaysOnTop(true);
} }
#if defined(OS_MACOSX) || defined(OS_WIN)
bool fullscreen; bool fullscreen;
if (options.Get(switches::kFullscreen, &fullscreen) && fullscreen) { if (options.Get(switches::kFullscreen, &fullscreen) && fullscreen) {
SetFullScreen(true); SetFullScreen(true);
} }
#endif
bool skip; bool skip;
if (options.Get(switches::kSkipTaskbar, &skip) && skip) { if (options.Get(switches::kSkipTaskbar, &skip) && skip) {
SetSkipTaskbar(skip); SetSkipTaskbar(skip);

13
atom/browser/native_window_views.cc
View file

@ -285,14 +285,21 @@ NativeWindowViews::NativeWindowViews(
// Before the window is mapped the SetWMSpecState can not work, so we have // Before the window is mapped the SetWMSpecState can not work, so we have
// to manually set the _NET_WM_STATE. // to manually set the _NET_WM_STATE.
std::vector<::Atom> state_atom_list;
bool skip_taskbar = false; bool skip_taskbar = false;
if (options.Get(switches::kSkipTaskbar, &skip_taskbar) && skip_taskbar) { if (options.Get(switches::kSkipTaskbar, &skip_taskbar) && skip_taskbar) {
std::vector<::Atom> state_atom_list;
state_atom_list.push_back(GetAtom("_NET_WM_STATE_SKIP_TASKBAR")); state_atom_list.push_back(GetAtom("_NET_WM_STATE_SKIP_TASKBAR"));
ui::SetAtomArrayProperty(GetAcceleratedWidget(), "_NET_WM_STATE", "ATOM",
state_atom_list);
} }
// Before the window is mapped, there is no SHOW_FULLSCREEN_STATE.
bool fullscreen = false;
if (options.Get(switches::kFullscreen, & fullscreen) && fullscreen) {
state_atom_list.push_back(GetAtom("_NET_WM_STATE_FULLSCREEN"));
}
ui::SetAtomArrayProperty(GetAcceleratedWidget(), "_NET_WM_STATE", "ATOM",
state_atom_list);
// Set the _NET_WM_WINDOW_TYPE. // Set the _NET_WM_WINDOW_TYPE.
std::string window_type; std::string window_type;
if (options.Get(switches::kType, &window_type)) if (options.Get(switches::kType, &window_type))