From 8b5553d0a4cd8c5a4c4bdca37921f4e81c3bfaf4 Mon Sep 17 00:00:00 2001 From: Jindrich Susen Date: Thu, 24 Aug 2023 11:22:40 +0200 Subject: [PATCH 1/2] Combo box inputs were not aligned correctly when in the first column --- .../src/gui/Workbench/ScreenArea/TableView/TableViewEditor.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend-html/src/gui/Workbench/ScreenArea/TableView/TableViewEditor.tsx b/frontend-html/src/gui/Workbench/ScreenArea/TableView/TableViewEditor.tsx index a42bab40d6..6ce7300c74 100644 --- a/frontend-html/src/gui/Workbench/ScreenArea/TableView/TableViewEditor.tsx +++ b/frontend-html/src/gui/Workbench/ScreenArea/TableView/TableViewEditor.tsx @@ -198,6 +198,7 @@ export class TableViewEditor extends React.Component<{ xmlNode={this.props.property!.xmlNode} onDoubleClick={(event) => this.onDoubleClick(event)} isReadOnly={readOnly} + customStyle={resolveCellAlignment(this.props.property?.style, isFirsColumn, "Text")} foregroundColor={foregroundColor} backgroundColor={backgroundColor} autoSort={this.props.property!.autoSort} From 97cdce8a132f67d0e43de8e4fb7c870037e60478 Mon Sep 17 00:00:00 2001 From: Jindrich Susen Date: Thu, 24 Aug 2023 19:52:07 +0200 Subject: [PATCH 2/2] typo fixed --- .../Workbench/ScreenArea/TableView/TableViewEditor.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend-html/src/gui/Workbench/ScreenArea/TableView/TableViewEditor.tsx b/frontend-html/src/gui/Workbench/ScreenArea/TableView/TableViewEditor.tsx index 6ce7300c74..d774831b31 100644 --- a/frontend-html/src/gui/Workbench/ScreenArea/TableView/TableViewEditor.tsx +++ b/frontend-html/src/gui/Workbench/ScreenArea/TableView/TableViewEditor.tsx @@ -102,7 +102,7 @@ export class TableViewEditor extends React.Component<{ ? shadeHexColor(customBackgroundColor, -0.1) : customBackgroundColor; - const isFirsColumn = getTablePanelView(dataView)?.firstColumn === this.props.property; + const isFirstColumn = getTablePanelView(dataView)?.firstColumn === this.props.property; const gridFocusManager = getGridFocusManager(this.props.property); switch (this.props.property!.column) { case "Number": @@ -121,7 +121,7 @@ export class TableViewEditor extends React.Component<{ onClick={undefined} onDoubleClick={(event) => this.onDoubleClick(event)} onEditorBlur={this.props.onEditorBlur} - customStyle={resolveCellAlignment(this.props.property?.style, isFirsColumn, "Number")} + customStyle={resolveCellAlignment(this.props.property?.style, isFirstColumn, "Number")} subscribeToFocusManager={(editor, onBlur) =>{ gridFocusManager.activeEditor = editor gridFocusManager.editorBlur = onBlur; @@ -144,7 +144,7 @@ export class TableViewEditor extends React.Component<{ onKeyDown={this.props.onEditorKeyDown} onClick={undefined} wrapText={false} - customStyle={resolveCellAlignment(this.props.property?.style, isFirsColumn, "Text")} + customStyle={resolveCellAlignment(this.props.property?.style, isFirstColumn, "Text")} onDoubleClick={(event) => this.onDoubleClick(event)} onEditorBlur={this.props.onEditorBlur} isRichText={false} @@ -198,7 +198,7 @@ export class TableViewEditor extends React.Component<{ xmlNode={this.props.property!.xmlNode} onDoubleClick={(event) => this.onDoubleClick(event)} isReadOnly={readOnly} - customStyle={resolveCellAlignment(this.props.property?.style, isFirsColumn, "Text")} + customStyle={resolveCellAlignment(this.props.property?.style, isFirstColumn, "Text")} foregroundColor={foregroundColor} backgroundColor={backgroundColor} autoSort={this.props.property!.autoSort}