diff options
| author | bob <bcz@cs.brown.edu> | 2019-05-01 11:01:26 -0400 |
|---|---|---|
| committer | bob <bcz@cs.brown.edu> | 2019-05-01 11:01:26 -0400 |
| commit | bb86f44b561d8097c9059936d1d64d5d5eef72aa (patch) | |
| tree | 5f54cf0a5ffc889b7f012eb0e8f4a6d2942cb8e1 /src | |
| parent | 105ba2402ad0da59d3d0750fa045a0f47eb73848 (diff) | |
fixed merge error with mainoverlay text bounds
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/views/MainOverlayTextBox.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/MainOverlayTextBox.tsx b/src/client/views/MainOverlayTextBox.tsx index de8b3707d..d32e3f21b 100644 --- a/src/client/views/MainOverlayTextBox.tsx +++ b/src/client/views/MainOverlayTextBox.tsx @@ -90,7 +90,7 @@ export class MainOverlayTextBox extends React.Component<MainOverlayTextBoxProps> let s = this._textXf().Scale; return <div className="mainOverlayTextBox-textInput" style={{ transform: `translate(${textRect.left}px, ${textRect.top}px) scale(${1 / s},${1 / s})`, width: "auto", height: "auto" }} > <div className="mainOverlayTextBox-textInput" onPointerDown={this.textBoxDown} ref={this._textProxyDiv} onScroll={this.textScroll} - style={{ width: `${NumCast(this.TextDoc.width) * s}px`, height: `${NumCast(this.TextDoc.height) * s}px` }}> + style={{ width: `${textRect.width * s}px`, height: `${textRect.height * s}px` }}> <FormattedTextBox fieldKey={this._textFieldKey} isOverlay={true} Document={this.TextDoc} isSelected={returnTrue} select={emptyFunction} isTopMost={true} selectOnLoad={true} ContainingCollectionView={undefined} whenActiveChanged={emptyFunction} active={returnTrue} ScreenToLocalTransform={this._textXf} PanelWidth={returnZero} PanelHeight={returnZero} focus={emptyFunction} /> |