Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: normalize behavior of win.setOpacity() for invalid number values across operating systems #19535

Merged
merged 14 commits into from Aug 7, 2019
Merged

fix: normalize behavior of win.setOpacity() for invalid number values across operating systems #19535

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
859421e
fix: define behavior for out-of-bounds setOpacity
erickzhao Jul 30, 2019
68bdd16
fix linux issue
erickzhao Jul 30, 2019
e2a597b
fix getOpacity behaviour
erickzhao Jul 30, 2019
48984cf
wrong variable
erickzhao Jul 30, 2019
bfb49ce
normalize more stuff
erickzhao Jul 30, 2019
7d34c20
docs
erickzhao Jul 30, 2019
83fc694
test: use ifdescribe helper
erickzhao Jul 30, 2019
a970160
Update spec-main/api-browser-window-spec.ts
erickzhao Jul 31, 2019
b993a5e
fixes
erickzhao Jul 31, 2019
12ae5d1
Merge branch 'intern/set-opacity-beyond-bounds' of https://github.com…
erickzhao Jul 31, 2019
db9cefd
more tests!!!
erickzhao Aug 1, 2019
75b4f46
Update shell/browser/native_window_views.cc
erickzhao Aug 4, 2019
688906b
Update shell/browser/native_window_mac.mm
erickzhao Aug 4, 2019
3d6efb0
Merge branch 'master' into intern/set-opacity-beyond-bounds
erickzhao Aug 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions shell/browser/native_window_views.cc
View file
Open in desktop
Expand Up @@ -879,14 +879,14 @@ bool NativeWindowViews::HasShadow() {
}

void NativeWindowViews::SetOpacity(const double opacity) {
#if defined(OS_WIN)
double boundedOpacity = opacity;
if (opacity > 1) {
boundedOpacity = 1;
} else if (opacity < 0) {
boundedOpacity = 0;
}

erickzhao marked this conversation as resolved.
Show resolved Hide resolved
#if defined(OS_WIN)
HWND hwnd = GetAcceleratedWidget();
if (!layered_) {
LONG ex_style = ::GetWindowLong(hwnd, GWL_EXSTYLE);
Expand All @@ -895,8 +895,10 @@ void NativeWindowViews::SetOpacity(const double opacity) {
layered_ = true;
}
::SetLayeredWindowAttributes(hwnd, 0, boundedOpacity * 255, LWA_ALPHA);
#endif
opacity_ = boundedOpacity;
#else
opacity_ = 1; // setOpacity unsupported on Linux
erickzhao marked this conversation as resolved.
Show resolved Hide resolved
#endif
}

double NativeWindowViews::GetOpacity() {
Expand Down
6 changes: 6 additions & 0 deletions spec-main/api-browser-window-spec.ts
View file
Open in desktop
Expand Up @@ -1241,6 +1241,12 @@ describe('BrowserWindow module', () => {
})

describe('BrowserWindow.setOpacity(opacity)', () => {
before(function () {
erickzhao marked this conversation as resolved.
Show resolved Hide resolved
// setOpacity() unsupported on Linux
if (process.platform === 'linux') {
this.skip()
}
})
afterEach(closeAllWindows)
it('make window with initial opacity', () => {
const w = new BrowserWindow({ show: false, opacity: 0.5 })
Expand Down