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

Add Invalidate method to NativeWindow and add Mac implementation

Browse source
This commit is contained in:
Gary Wilber 2017-02-13 19:41:24 -08:00
parent 11e1f6b56c
commit f19924bcb0
6 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/api/atom_api_web_contents.cc
View file

@ -1496,12 +1496,8 @@ void WebContents::Invalidate() {
osr_rwhv->Invalidate();
} else {
const auto ownerWindow = owner_window();
const auto nativeWindow = ownerWindow ? ownerWindow->GetNativeWindow() :
nullptr;
if (nativeWindow) {
const gfx::Rect& bounds = nativeWindow->bounds();
nativeWindow->SchedulePaintInRect(
gfx::Rect(0, 0, bounds.width(), bounds.height()));
if (ownerWindow) {
ownerWindow->Invalidate();
}
}
}

1
atom/browser/native_window.h
View file

@ -124,6 +124,7 @@ class NativeWindow : public base::SupportsUserData,
std::string* error = nullptr) = 0;
virtual bool IsAlwaysOnTop() = 0;
virtual void Center() = 0;
virtual void Invalidate() = 0;
virtual void SetTitle(const std::string& title) = 0;
virtual std::string GetTitle() = 0;
virtual void FlashFrame(bool flash) = 0;

1
atom/browser/native_window_mac.h
View file

@ -71,6 +71,7 @@ class NativeWindowMac : public NativeWindow,
int relativeLevel, std::string* error) override;
bool IsAlwaysOnTop() override;
void Center() override;
void Invalidate() override;
void SetTitle(const std::string& title) override;
std::string GetTitle() override;
void FlashFrame(bool flash) override;

5
atom/browser/native_window_mac.mm
View file

@ -1101,6 +1101,11 @@ void NativeWindowMac::Center() {
[window_ center];
}
void NativeWindowMac::Invalidate() {
[window_ flushWindow];
[[window_ contentView] setNeedsDisplay:TRUE];
}
void NativeWindowMac::SetTitle(const std::string& title) {
// For macOS <= 10.9, the setTitleVisibility API is not available, we have
// to avoid calling setTitle for frameless window.

6
atom/browser/native_window_views.cc
View file

@ -695,6 +695,12 @@ void NativeWindowViews::Center() {
window_->CenterWindow(GetSize());
}
void NativeWindowViews::Invalidate() {
const gfx::Rect& bounds = GetBounds();
window_->SchedulePaintInRect(
gfx::Rect(0, 0, bounds.width(), bounds.height()));
}
void NativeWindowViews::SetTitle(const std::string& title) {
title_ = title;
window_->UpdateWindowTitle();

1
atom/browser/native_window_views.h
View file

@ -90,6 +90,7 @@ class NativeWindowViews : public NativeWindow,
int relativeLevel, std::string* error) override;
bool IsAlwaysOnTop() override;
void Center() override;
void Invalidate() override;
void SetTitle(const std::string& title) override;
std::string GetTitle() override;
void FlashFrame(bool flash) override;