if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: SDA-2644 - Resolve conflicts and add new changes

Browse Source
This commit is contained in:
Kiran Niranjan 2020-11-18 16:12:55 +05:30 committed by psjostrom
parent cd60ae268a
commit eb94467220
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spec/__snapshots__/snippingTool.spec.tsx.snap
View File

@ -63,8 +63,7 @@ exports[`Snipping Tool should render correctly 1`] = `
>
<AnnotateArea
chosenTool="PEN"
data-testid="annotate-component"
highlightColor="rgba(0, 142, 255, 0.64)"
data-testid="annotate-component"highlightColor="rgba(0, 142, 255, 0.64)"
imageDimensions={
Object {
"height": 600,

2
src/app/window-handler.ts
View File

@ -961,8 +961,8 @@ export class WindowHandler {
const parentWindow = BrowserWindow.getFocusedWindow();
const MIN_HEIGHT = 312;
const MIN_WIDTH = 320;
const CONTAINER_HEIGHT = 175;
const OS_PADDING = 25;
const CONTAINER_HEIGHT = 190;
let height: number = dimensions?.height || 0;
let width: number = dimensions?.width || 0;

5
src/renderer/components/snipping-tool.tsx
View File

@ -304,9 +304,8 @@ const SnippingTool: React.FunctionComponent<ISnippingToolProps> = ({ existingPat
<main>
<div className='imageContainer'>
<AnnotateArea
data-testid='annotate-component'
paths={paths}
highlightColor={highlightColor.rgbaColor}
data-testid='annotate-component'paths={paths}
highlightColor={highlightColor.rgbaColor}
penColor={penColor.rgbaColor}
onChange={setPaths}
imageDimensions={imageDimensions}

1
src/renderer/styles/snipping-tool.less
View File

@ -54,6 +54,7 @@ button {
text-align: center;
align-items: center;
padding: 12px;
padding: 12px;
.ActionButton {
width: 24px;