third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js - Issue 2706293007: [DevTools] Fix Dialog's close button to properly close dialog.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js

Issue 2706293007: [DevTools] Fix Dialog's close button to properly close dialog. (Closed)

Patch Set: test Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/ui/SuggestBox.js ('k') | third_party/WebKit/Source/devtools/front_end/ui/UIUtils.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js

diff --git a/third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js b/third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js

index 983ceebae31c0223b2fda97b05ac44f5607f8eaf..1607fe6b61da8dd077f1c0010671215f7060dab0 100644

--- a/third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js

+++ b/third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js

@@ -125,24 +125,24 @@ UI.Toolbar = class {

var optionsGlassPane = new UI.GlassPane();

optionsGlassPane.setBlockPointerEvents(true);

- optionsGlassPane.showGlassPane(document);

+ optionsGlassPane.show(document);

var optionsBar = new UI.Toolbar('fill', optionsGlassPane.contentElement);

optionsBar._contentElement.classList.add('floating');

const buttonHeight = 26;

- var hostButtonPosition = button.element.totalOffset();

+ var hostButtonPosition = button.element.boxInWindow().relativeToElement(UI.GlassPane.container(document));

- var topNotBottom = hostButtonPosition.top + buttonHeight * buttons.length < document.documentElement.offsetHeight;

+ var topNotBottom = hostButtonPosition.y + buttonHeight * buttons.length < document.documentElement.offsetHeight;

if (topNotBottom)

buttons = buttons.reverse();

optionsBar.element.style.height = (buttonHeight * buttons.length) + 'px';

if (topNotBottom)

- optionsBar.element.style.top = (hostButtonPosition.top + 1) + 'px';

+ optionsBar.element.style.top = (hostButtonPosition.y - 5) + 'px';

else

- optionsBar.element.style.top = (hostButtonPosition.top - (buttonHeight * (buttons.length - 1))) + 'px';

- optionsBar.element.style.left = (hostButtonPosition.left + 1) + 'px';

+ optionsBar.element.style.top = (hostButtonPosition.y - (buttonHeight * (buttons.length - 1)) - 6) + 'px';

+ optionsBar.element.style.left = (hostButtonPosition.x - 5) + 'px';

for (var i = 0; i < buttons.length; ++i) {

buttons[i].element.addEventListener('mousemove', mouseOver, false);

@@ -169,7 +169,7 @@ UI.Toolbar = class {

function mouseUp(e) {

if (e.which !== 1)

return;

- optionsGlassPane.hideGlassPane();

+ optionsGlassPane.hide();

document.documentElement.removeEventListener('mouseup', mouseUp, false);

for (var i = 0; i < buttons.length; ++i) {