@@ -1782,7 +1782,7 @@ function getMethods(typename, obj) {
17821782 pad.fAbsWNDC = (x2-x1) * this.fAbsWNDC;
17831783 pad.fAbsHNDC = (y2-y1) * this.fAbsHNDC;
17841784 pad.fAbsXlowNDC = this.fAbsXlowNDC + x1 * this.fAbsWNDC;
1785- pad.fAbsYlowNDC = this.fAbsYlowNDC + y1 * this.fAbsWNDC ;
1785+ pad.fAbsYlowNDC = this.fAbsYlowNDC + y1 * this.fAbsHNDC ;
17861786 } else {
17871787 pad.fAbsWNDC = x2 - x1;
17881788 pad.fAbsHNDC = y2 - y1;
@@ -78264,7 +78264,8 @@ class TPadPainter extends ObjectPainter {
7826478264 this.is_active_pad = is_active;
7826578265 }
7826678266
78267- if (this.is_active_pad === undefined) return;
78267+ if (this.is_active_pad === undefined)
78268+ return;
7826878269
7826978270 if (!svg_rect)
7827078271 svg_rect = this.iscan ? this.getCanvSvg().selectChild('.canvas_fillrect') : this.svg_this_pad().selectChild('.root_pad_border');
@@ -79078,22 +79079,24 @@ class TPadPainter extends ObjectPainter {
7907879079 const do_divide = arg => {
7907979080 if (!arg || !isStr(arg))
7908079081 return;
79081- const arr = arg.split('x');
7908279082 // workaround - prevent full deletion of canvas
7908379083 if (this.normal_canvas === false)
7908479084 this.normal_canvas = true;
7908579085 this.cleanPrimitives(true);
79086+ if (arg === 'reset')
79087+ return;
79088+ const arr = arg.split('x');
7908679089 if (arr.length === 1)
7908779090 this.divide(Number.parseInt(arr[0]));
79088- if (arr.length === 2)
79091+ else if (arr.length === 2)
7908979092 this.divide(Number.parseInt(arr[0]), Number.parseInt(arr[1]));
7909079093 };
7909179094
7909279095 if (isFunc(this.drawObject))
7909379096 menu.add('Build legend', () => this.buildLegend());
7909479097
7909579098 menu.sub('Divide', () => menu.input('Input divide arg', '2x2').then(do_divide), 'Divide on sub-pads');
79096- ['1x2', '2x1', '2x2', '2x3', '3x2', '3x3', '4x4'].forEach(item => menu.add(item, item, do_divide));
79099+ ['1x2', '2x1', '2x2', '2x3', '3x2', '3x3', '4x4', 'reset' ].forEach(item => menu.add(item, item, do_divide));
7909779100 menu.endsub();
7909879101
7909979102 menu.add('Save to gStyle', () => {
@@ -157125,7 +157128,7 @@ class HierarchyPainter extends BasePainter {
157125157128 const cp = getElementCanvPainter(dom);
157126157129
157127157130 if (cp) {
157128- if (sett?.has_same)
157131+ if (sett?.has_same && mp )
157129157132 opt = 'same ' + opt;
157130157133 } else
157131157134 this.cleanupFrame(dom);
0 commit comments