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

Make WindowStateWatcher X11 only

Browse source 
On Windows we need to take another way of detecting window state events.
This commit is contained in:
Cheng Zhao 2014-11-25 13:05:04 +08:00
parent b77e6c369a
commit 588cc3c7ab
5 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

86
atom/browser/ui/views/window_state_watcher.cc
View file

@ -1,86 +0,0 @@
// Copyright (c) 2014 GitHub, Inc.
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include "atom/browser/ui/views/window_state_watcher.h"
#if defined(USE_X11)
#include <X11/Xlib.h>
#endif
#include "ui/events/platform/platform_event_source.h"
namespace atom {
namespace {
const char* kAtomsToCache[] = {
"_NET_WM_STATE",
NULL,
};
} // namespace
WindowStateWatcher::WindowStateWatcher(NativeWindowViews* window)
: window_(window),
widget_(window->GetAcceleratedWidget()),
#if defined(USE_X11)
atom_cache_(gfx::GetXDisplay(), kAtomsToCache),
#endif
was_minimized_(false),
was_maximized_(false) {
ui::PlatformEventSource::GetInstance()->AddPlatformEventObserver(this);
}
WindowStateWatcher::~WindowStateWatcher() {
ui::PlatformEventSource::GetInstance()->RemovePlatformEventObserver(this);
}
void WindowStateWatcher::WillProcessEvent(const ui::PlatformEvent& event) {
if (IsWindowStateEvent(event)) {
was_minimized_ = window_->IsMinimized();
was_maximized_ = window_->IsMaximized();
}
}
void WindowStateWatcher::DidProcessEvent(const ui::PlatformEvent& event) {
if (IsWindowStateEvent(event)) {
bool is_minimized = window_->IsMinimized();
bool is_maximized = window_->IsMaximized();
bool is_fullscreen = window_->IsFullscreen();
if (is_minimized != was_minimized_) {
if (is_minimized)
window_->NotifyWindowMinimize();
else
window_->NotifyWindowRestore();
} else if (is_maximized != was_maximized_) {
if (is_maximized)
window_->NotifyWindowMaximize();
else
window_->NotifyWindowUnmaximize();
} else {
// If this is neither a "maximize" or "minimize" event, then we think it
// is a "fullscreen" event.
// The "IsFullscreen()" becomes true immediately before "WillProcessEvent"
// is called, so we can not handle this like "maximize" and "minimize" by
// watching whether they have changed.
if (is_fullscreen)
window_->NotifyWindowEnterFullScreen();
else
window_->NotifyWindowLeaveFullScreen();
}
}
}
bool WindowStateWatcher::IsWindowStateEvent(const ui::PlatformEvent& event) {
#if defined(USE_X11)
::Atom changed_atom = event->xproperty.atom;
return (changed_atom == atom_cache_.GetAtom("_NET_WM_STATE") &&
event->type == PropertyNotify &&
event->xproperty.window == widget_);
#else
return false;
#endif
}
} // namespace atom

41
atom/browser/ui/views/window_state_watcher.h
View file

@ -1,41 +0,0 @@
// Copyright (c) 2014 GitHub, Inc.
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include "ui/events/platform/platform_event_observer.h"
#include "atom/browser/native_window_views.h"
#if defined(USE_X11)
#include "ui/gfx/x/x11_atom_cache.h"
#endif
namespace atom {
class WindowStateWatcher : public ui::PlatformEventObserver {
public:
explicit WindowStateWatcher(NativeWindowViews* window);
virtual ~WindowStateWatcher();
protected:
// ui::PlatformEventObserver:
void WillProcessEvent(const ui::PlatformEvent& event) override;
void DidProcessEvent(const ui::PlatformEvent& event) override;
private:
bool IsWindowStateEvent(const ui::PlatformEvent& event);
NativeWindowViews* window_;
gfx::AcceleratedWidget widget_;
#if defined(USE_X11)
ui::X11AtomCache atom_cache_;
#endif
bool was_minimized_;
bool was_maximized_;
DISALLOW_COPY_AND_ASSIGN(WindowStateWatcher);
};
} // namespace atom