Skip to content

Commit

Permalink
Build wit frame defaults
Browse files Browse the repository at this point in the history
  • Loading branch information
linev committed Dec 2, 2024
1 parent e57154f commit 773094d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
14 changes: 9 additions & 5 deletions build/jsroot.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const version_id = 'dev',

/** @summary version date
* @desc Release date in format day/month/year like '14/04/2022' */
version_date = '29/11/2024',
version_date = '2/12/2024',

/** @summary version id and date
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
Expand Down Expand Up @@ -61740,6 +61740,8 @@ class JSRootMenu {
this.addSizeMenu('Line width', 1, 10, 1, gStyle.fFrameLineWidth, w => { gStyle.fFrameLineWidth = w; });
this.addLineStyleMenu('Line style', gStyle.fFrameLineStyle, st => { gStyle.fFrameLineStyle = st; });
this.addSizeMenu('Border size', 0, 10, 1, gStyle.fFrameBorderSize, sz => { gStyle.fFrameBorderSize = sz; });
this.addSelectMenu('Border mode', ['Down', 'Off', 'Up'], gStyle.fFrameBorderMode + 1, v => { gStyle.fFrameBorderMode = v - 1; });

// fFrameBorderMode: 0,
this.sub('Margins');
this.addSizeMenu('Bottom', 0, 0.5, 0.05, gStyle.fPadBottomMargin, v => { gStyle.fPadBottomMargin = v; });
Expand Down Expand Up @@ -65551,8 +65553,8 @@ class TFramePainter extends ObjectPainter {
this.axes_drawn = false;
this.axes2_drawn = false;
this.keys_handler = null;
this._borderMode = 0;
this._borderSize = 0;
this._borderMode = gStyle.fFrameBorderMode;
this._borderSize = gStyle.fFrameBorderSize;
this.projection = 0; // different projections
}

Expand Down Expand Up @@ -66255,7 +66257,7 @@ class TFramePainter extends ObjectPainter {
else if (pad)
this.createAttFill({ attr: pad });
else
this.createAttFill({ pattern: 1001, color: 0 });
this.createAttFill({ pattern: gStyle.fFrameFillStyle, color: gStyle.fFrameFillColor });

// force white color for the canvas frame
if (!tframe && this.fillatt.empty() && pp?.iscan)
Expand All @@ -66266,8 +66268,10 @@ class TFramePainter extends ObjectPainter {

if (!tframe && (pad?.fFrameLineColor !== undefined))
this.createAttLine({ color: pad.fFrameLineColor, width: pad.fFrameLineWidth, style: pad.fFrameLineStyle });
else
else if (tframe)
this.createAttLine({ attr: tframe, color: 'black' });
else
this.createAttLine({ color: gStyle.fFrameLineColor, width: gStyle.fFrameLineWidth, style: gStyle.fFrameLineStyle });
}

/** @summary Function called at the end of resize of frame
Expand Down
2 changes: 1 addition & 1 deletion modules/core.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const version_id = 'dev',

/** @summary version date
* @desc Release date in format day/month/year like '14/04/2022' */
version_date = '29/11/2024',
version_date = '2/12/2024',

/** @summary version id and date
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
Expand Down

0 comments on commit 773094d

Please sign in to comment.