From 6f8752adb47ee87a144106b258393756af2ba0b3 Mon Sep 17 00:00:00 2001 From: Rebecca Williams Date: Thu, 6 Jun 2024 12:34:57 +0100 Subject: [PATCH] Handle BOB file default word-wrap property --- src/ui/widgets/EmbeddedDisplay/bobParser.test.ts | 3 +++ src/ui/widgets/EmbeddedDisplay/parser.ts | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/src/ui/widgets/EmbeddedDisplay/bobParser.test.ts b/src/ui/widgets/EmbeddedDisplay/bobParser.test.ts index da29d1a..451893d 100644 --- a/src/ui/widgets/EmbeddedDisplay/bobParser.test.ts +++ b/src/ui/widgets/EmbeddedDisplay/bobParser.test.ts @@ -37,6 +37,7 @@ describe("opi widget parser", (): void => { 10 20 hello + false `; @@ -56,6 +57,7 @@ describe("opi widget parser", (): void => { expect(widget.foregroundColor).toEqual(Color.RED); // Unrecognised property not passed on. expect(widget.not_a_property).toEqual(undefined); + expect(widget.wrapWords).toEqual(false); }); const readbackString = ` @@ -113,6 +115,7 @@ describe("opi widget parser", (): void => { .children?.[0] as WidgetDescription; expect(widget.precisionFromPv).toEqual(true); expect(widget.showUnits).toEqual(true); + expect(widget.wrapWords).toEqual(true); }); const readbackPrecisionUnits = ` diff --git a/src/ui/widgets/EmbeddedDisplay/parser.ts b/src/ui/widgets/EmbeddedDisplay/parser.ts index 7b7d0b6..b6ff6f5 100644 --- a/src/ui/widgets/EmbeddedDisplay/parser.ts +++ b/src/ui/widgets/EmbeddedDisplay/parser.ts @@ -162,6 +162,11 @@ export function parseWidget( if (widgetDescription.showUnits === undefined) { widgetDescription.showUnits = true; } + // Default to true if wrapWords is not defined. + // Applicable to BOB files. + if (widgetDescription.wrapWords === undefined) { + widgetDescription.wrapWords = true; + } return widgetDescription; }