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

Making fullsceenable work on Linux

Browse source
This commit is contained in:
brenca 2016-02-27 22:37:42 +01:00
parent bb42c85df8
commit a06392459e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/native_window.cc
View file

@ -133,7 +133,7 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
if (options.Get(options::kAlwaysOnTop, &top) && top) { if (options.Get(options::kAlwaysOnTop, &top) && top) {
SetAlwaysOnTop(true); SetAlwaysOnTop(true);
} }
#if defined(OS_MACOSX) || defined(OS_WIN)
// Disable fullscreen button when 'fullscreenable' is false or 'fullscreen' // Disable fullscreen button when 'fullscreenable' is false or 'fullscreen'
// is specified to false. // is specified to false.
bool fullscreenable = true; bool fullscreenable = true;
@ -144,7 +144,7 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
SetFullScreenable(fullscreenable); SetFullScreenable(fullscreenable);
if (fullscreen) if (fullscreen)
SetFullScreen(true); SetFullScreen(true);
#endif
bool skip; bool skip;
if (options.Get(options::kSkipTaskbar, &skip) && skip) { if (options.Get(options::kSkipTaskbar, &skip) && skip) {
SetSkipTaskbar(skip); SetSkipTaskbar(skip);

2
atom/browser/native_window_views.cc
View file

@ -379,7 +379,7 @@ void NativeWindowViews::SetFullScreen(bool fullscreen) {
if (IsFullScreenable()) if (IsFullScreenable())
window_->SetFullscreen(fullscreen); window_->SetFullscreen(fullscreen);
#else #else
if (!fullscreen || IsFullScreenable()) { if (!fullscreen || (fullscreen && IsFullScreenable())) {
if (IsVisible()) if (IsVisible())
window_->SetFullscreen(fullscreen); window_->SetFullscreen(fullscreen);
else else