Merge branch 'fix/ivette/toolbars' into 'master'

[Ivette] Small fix to ivette toolbars

See merge request frama-c/frama-c!4527

ivette/src/frama-c/kernel/ASTview.tsx

@@ -29,7 +29,6 @@ import * as Utils from 'dome/data/arrays';
 import * as States from 'frama-c/states';
 import * as Settings from 'dome/data/settings';
 import { IconButton } from 'dome/controls/buttons';
-import { Filler, Inset } from 'dome/frame/toolbars';
 import * as Studia from 'frama-c/plugins/studia';
 import * as Ast from 'frama-c/kernel/api/ast';
 import { text } from 'frama-c/kernel/api/data';
@@ -739,14 +738,12 @@ export default function ASTview(): JSX.Element {
   return (
     <>
       <TitleBar>
-        <Filler />
         <IconButton
           icon={icon}
           onClick= {unFoldButtonClicked}
           title={title + ' all multi-line ACSL properties'}
           className="titlebar-thin-icon"
         />
-        <Inset />
       </TitleBar>
       <Component style={{ fontSize: `${fontSize}px` }} />
     </>

ivette/src/ivette/index.tsx

@@ -33,6 +33,7 @@ import React from 'react';
 import { DEVEL } from 'dome';
 import { Label } from 'dome/controls/labels';
 import { DefineElement } from 'dome/layout/dispatch';
+import { Inset } from 'dome/frame/toolbars';
 import * as State from './state';
 import * as Search from './search';
 
@@ -191,6 +192,7 @@ export function TitleBar(props: TitleBarProps): JSX.Element | null {
         title={title || context.title}
       />
       {children}
+      <Inset />
     </DefineElement>
   );
 }

ivette/src/renderer/Application.tsx

@@ -49,8 +49,6 @@ import './style.css';
 export default function Application(): JSX.Element {
   const [sidebar, flipSidebar] =
     Dome.useFlipSettings('frama-c.sidebar.unfold', true);
-  const [viewbar, flipViewbar] =
-    Dome.useFlipSettings('frama-c.viewbar.unfold', true);
 
   const ToolBar = State.useChildren(TOOLBAR);
   const StatusBar = State.useChildren(STATUSBAR);
@@ -72,12 +70,6 @@ export default function Application(): JSX.Element {
         <IvettePrefs.ThemeSwitchTool />
         <IvettePrefs.FontTools />
         <Search.SearchField />
-        <Toolbar.Button
-          icon="ITEMS.GRID"
-          title="Customize Main View"
-          selected={viewbar}
-          onClick={flipViewbar}
-        />
       </Toolbar.ToolBar>
       <LSplit settings="frama-c.sidebar.split" unfold={sidebar}>
         <Sidebar.Panel />