Skip to content

Commit 71bfd63

Browse files
committed
Fix bug in frame drawing
Prevent creation of two frame painters at the same time
1 parent 01045ee commit 71bfd63

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

scripts/JSRoot.gpad.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4358,13 +4358,13 @@ JSROOT.define(['d3', 'painter'], (d3, jsrp) => {
43584358

43594359
painter.addPadButtons();
43604360

4361-
if (nocanvas && opt.indexOf("noframe") < 0)
4362-
drawFrame(divid, null);
4363-
4364-
// select global reference - required for keys handling
4365-
jsrp.selectActivePad({ pp: painter, active: true });
4361+
let promise = (nocanvas && opt.indexOf("noframe") < 0) ? drawFrame(divid, null) : Promise.resolve(true);
4362+
return promise.then(() => {
4363+
// select global reference - required for keys handling
4364+
jsrp.selectActivePad({ pp: painter, active: true });
43664365

4367-
return painter.drawPrimitives().then(() => {
4366+
return painter.drawPrimitives();
4367+
}).then(() => {
43684368
painter.showPadButtons();
43694369
return painter;
43704370
});

0 commit comments

Comments
 (0)