@@ -11,7 +11,7 @@ let version_id = '7.3.x';
1111
1212/** @summary version date
1313 * @desc Release date in format day/month/year like '14/04/2022' */
14- let version_date = '10 /02/2023';
14+ let version_date = '23 /02/2023';
1515
1616/** @summary version id and date
1717 * @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -8237,8 +8237,8 @@ class BasePainter {
82378237 }
82388238
82398239 let rect_origin = getElementRect(main_origin, true),
8240- can_resize = main_origin.attr('can_resize'),
8241- do_resize = false;
8240+ can_resize = main_origin.attr('can_resize'),
8241+ do_resize = false;
82428242
82438243 if (can_resize == 'height')
82448244 if (height_factor && Math.abs(rect_origin.width * height_factor - rect_origin.height) > 0.1 * rect_origin.width) do_resize = true;
@@ -8258,19 +8258,22 @@ class BasePainter {
82588258 }
82598259
82608260 let rect = getElementRect(main),
8261- old_h = main.property('draw_height '),
8262- old_w = main.property('draw_width ');
8261+ old_h = main.property('_jsroot_height '),
8262+ old_w = main.property('_jsroot_width ');
82638263
82648264 rect.changed = false;
82658265
82668266 if (old_h && old_w && (old_h > 0) && (old_w > 0)) {
82678267 if ((old_h !== rect.height) || (old_w !== rect.width))
8268- if (( check_level > 1) || (rect.width / old_w < 0.66 ) || (rect.width / old_w > 1.5 ) ||
8269- (rect.height / old_h < 0.66) && (rect.height / old_h > 1.5)) rect.changed = true ;
8268+ rect.changed = ( check_level > 1) || (rect.width / old_w < 0.9 ) || (rect.width / old_w > 1.1 ) ||
8269+ (rect.height / old_h < 0.9) || (rect.height / old_h > 1.1) ;
82708270 } else {
82718271 rect.changed = true;
82728272 }
82738273
8274+ if (rect.changed)
8275+ main.property('_jsroot_height', rect.height).property('_jsroot_width', rect.width);
8276+
82748277 return rect;
82758278 }
82768279
@@ -48275,7 +48278,8 @@ class JSRootMenu {
4827548278 arg => { faxis.fLabelColor = arg; painter.interactiveRedraw('pad', getColorExec(arg, 'SetLabelColor'), kind); });
4827648279 this.addSizeMenu('Offset', 0, 0.1, 0.01, faxis.fLabelOffset,
4827748280 arg => { faxis.fLabelOffset = arg; painter.interactiveRedraw('pad', `exec:SetLabelOffset(${arg})`, kind); });
48278- this.addSizeMenu('Size', 0.02, 0.11, 0.01, faxis.fLabelSize,
48281+ let a = faxis.fLabelSize >= 1;
48282+ this.addSizeMenu('Size', a ? 2 : 0.02, a ? 30 : 0.11, a ? 2 : 0.01, faxis.fLabelSize,
4827948283 arg => { faxis.fLabelSize = arg; painter.interactiveRedraw('pad', `exec:SetLabelSize(${arg})`, kind); });
4828048284 this.add('endsub:');
4828148285 this.add('sub:Title');
@@ -48295,7 +48299,8 @@ class JSRootMenu {
4829548299 arg => { faxis.fTitleColor = arg; painter.interactiveRedraw('pad', getColorExec(arg, 'SetTitleColor'), kind); });
4829648300 this.addSizeMenu('Offset', 0, 3, 0.2, faxis.fTitleOffset,
4829748301 arg => { faxis.fTitleOffset = arg; painter.interactiveRedraw('pad', `exec:SetTitleOffset(${arg})`, kind); });
48298- this.addSizeMenu('Size', 0.02, 0.11, 0.01, faxis.fTitleSize,
48302+ a = faxis.fTitleSize >= 1;
48303+ this.addSizeMenu('Size', a ? 2 : 0.02, a ? 30 : 0.11, a ? 2 : 0.01, faxis.fTitleSize,
4829948304 arg => { faxis.fTitleSize = arg; painter.interactiveRedraw('pad', `exec:SetTitleSize(${arg})`, kind); });
4830048305 this.add('endsub:');
4830148306 this.add('sub:Ticks');
@@ -55493,14 +55498,14 @@ class TPadPainter extends ObjectPainter {
5549355498 r.ux1 = func(main.logx, r.ux1, 0);
5549455499 r.ux2 = func(main.logx, r.ux2, 1);
5549555500
55496- let k = (r.ux1 - r.ux2)/ frect.width;
55501+ let k = (r.ux2 - r.ux1)/( frect.width || 10) ;
5549755502 r.px1 = r.ux1 - k*frect.x;
5549855503 r.px2 = r.px1 + k*this.getPadWidth();
5549955504
5550055505 r.uy1 = func(main.logy, r.uy1, 0);
5550155506 r.uy2 = func(main.logy, r.uy2, 1);
5550255507
55503- k = (r.uy2 - r.uy1)/frect.height;
55508+ k = (r.uy2 - r.uy1)/( frect.height || 10) ;
5550455509 r.py1 = r.uy1 - k*frect.y;
5550555510 r.py2 = r.py1 + k*this.getPadHeight();
5550655511
0 commit comments