Skip to content
Snippets Groups Projects
Commit 00b2b916 authored by Maxime Jacquemin's avatar Maxime Jacquemin
Browse files

Merge branch 'fix/ivette/eva-details' into 'master'

Fix/ivette/eva details

See merge request frama-c/frama-c!3692
parents 967d0453 82ed07db
Branches
Tags
No related merge requests found
......@@ -64,7 +64,6 @@
/* -------------------------------------------------------------------------- */
.eva-cell-alarms {
z-index: 1;
margin: 0px;
padding: 0px;
margin-right: 4px;
......@@ -253,14 +252,6 @@ tr:first-of-type > .eva-table-callsite-box {
white-space: pre;
}
.eva-table-values-left {
text-align: left;
}
.eva-table-values-center {
text-align: center;
}
.eva-table-descrs {
background-color: var(--background-sidebar);
border-right: thin solid var(--border);
......
......@@ -72,13 +72,15 @@ function isPinnedMarker(status: MarkerStatus): boolean {
interface TableCellProps {
children?: JSX.Element | JSX.Element[];
right?: JSX.Element;
align?: 'left' | 'center';
}
function TableCell(props: TableCellProps): JSX.Element {
const { children, right } = props;
const { children, right, align = 'center' } = props;
const leftVisible = align === 'center' ? 'block' : 'none';
return (
<div className='eva-cell-container'>
<div className='eva-cell-left'/>
<div className='eva-cell-left' style={{ display: leftVisible }}/>
<div className='eva-cell-content'>
{children}
</div>
......@@ -480,7 +482,7 @@ function ProbeValues(props: ProbeValuesProps): Request<callstack, JSX.Element> {
const isSelected = isSelectedCallstack(callstack);
const selected = isSelected && callstack !== 'Summary' ? 'eva-focused' : '';
const font = callstack === 'Summary' ? 'eva-italic' : '';
const className = classes('eva-table-values', selected, font);
const c = classes('eva-table-values', selected, font);
const kind = callstack === 'Summary' ? 'one' : 'this';
const title = `At least one alarm is raised in ${kind} callstack`;
function td(e?: Values.evaluation, colSpan = 1): JSX.Element {
......@@ -488,13 +490,11 @@ function ProbeValues(props: ProbeValuesProps): Request<callstack, JSX.Element> {
const status = getAlarmStatus(alarms);
const alarmClass = classes('eva-cell-alarms', `eva-alarm-${status}`);
const align = value?.includes('\n') ? 'left' : 'center';
const alignClass = `eva-table-values-${align}`;
const c = classes(className, alignClass);
const warning =
<Icon className={alarmClass} size={10} title={title} id="WARNING" />;
return (
<td className={c} colSpan={colSpan} onContextMenu={onContextMenu(e)}>
<TableCell right={warning}>
<TableCell right={warning} align={align}>
<span className='eva-table-text'>{value}</span>
</TableCell>
</td>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment