Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX: Combo box inputs were not aligned correctly when in the first column 2022.4 #1835

Merged
merged 2 commits into from Aug 25, 2023
Merged

FIX: Combo box inputs were not aligned correctly when in the first column 2022.4 #1835

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b5553d
Combo box inputs were not aligned correctly when in the first column
JindrichSusen Aug 24, 2023
97cdce8
typo fixed
JindrichSusen Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions frontend-html/src/gui/Workbench/ScreenArea/TableView/TableViewEditor.tsx
View file
Open in desktop
Expand Up @@ -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":
Expand All @@ -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;
Expand All @@ -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}
Expand Down Expand Up @@ -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, isFirstColumn, "Text")}
foregroundColor={foregroundColor}
backgroundColor={backgroundColor}
autoSort={this.props.property!.autoSort}
Expand Down