Skip to content

Commit adab3d4

Browse files
committed
Fix - correct animation for status line (when visible)
1 parent ae061a7 commit adab3d4

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

scripts/JSRootPainter.jquery.js

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -969,9 +969,9 @@
969969
HierarchyPainter.prototype.ToggleBrowserVisisbility = function() {
970970
if (!this.gui_div || (typeof this.browser_visible==='string')) return;
971971

972-
var main = d3.select("#" + this.gui_div + " .jsroot_browser");
972+
var main = d3.select("#" + this.gui_div + " .jsroot_browser"),
973+
area = main.select('.jsroot_browser_area');
973974

974-
var area = main.select('.jsroot_browser_area');
975975
if (area.empty()) return;
976976

977977
var vsepar = main.select(".jsroot_v_separator"),
@@ -997,21 +997,26 @@
997997
tgt_drawing = "0px";
998998
}
999999

1000-
var hpainter = this, visible_at_the_end = !this.browser_visible;
1000+
var hpainter = this, visible_at_the_end = !this.browser_visible, _duration = 700;
10011001

10021002
this.browser_visible = 'changing';
10031003

1004-
area.transition().style('left', tgt).duration(700).on("end", function() {
1004+
area.transition().style('left', tgt).duration(_duration).on("end", function() {
10051005
hpainter.browser_visible = visible_at_the_end;
10061006
if (visible_at_the_end) hpainter.SetButtonsPosition();
10071007
});
10081008

10091009
if (!visible_at_the_end)
1010-
main.select(".jsroot_browser_btns").transition().style('left', '7px').style('top', '7px').duration(700);
1010+
main.select(".jsroot_browser_btns").transition().style('left', '7px').style('top', '7px').duration(_duration);
10111011

10121012
if (!vsepar.empty()) {
1013-
vsepar.transition().style('left', tgt_separ).duration(700);
1014-
drawing.transition().style('left', tgt_drawing).duration(700).on("end", this.CheckResize.bind(this));
1013+
vsepar.transition().style('left', tgt_separ).duration(_duration);
1014+
drawing.transition().style('left', tgt_drawing).duration(_duration).on("end", this.CheckResize.bind(this));
1015+
}
1016+
1017+
if (this.status_layout) {
1018+
main.select(".jsroot_h_separator").transition().style('left', tgt_drawing).duration(_duration);
1019+
main.select(".jsroot_status_area").transition().style('left', tgt_drawing).duration(_duration);
10151020
}
10161021
}
10171022

@@ -1228,7 +1233,7 @@
12281233
HierarchyPainter.prototype.CreateStatusLine = function(height, mode) {
12291234
if (this.status_disabled || !this.gui_div) return '';
12301235

1231-
var main = d3.select("#"+this.gui_div+" .jsroot_browser");
1236+
var main = d3.select("#"+this.gui_div + " .jsroot_browser");
12321237
if (main.empty()) return '';
12331238

12341239
var id = this.gui_div + "_status",

0 commit comments

Comments
 (0)