From b824b51068164e8eb7f6f20eb7c39f33e622ea7a Mon Sep 17 00:00:00 2001
From: Glenn Fischer <gfischer@ub.uni-leipzig.de>
Date: Thu, 21 Feb 2019 17:36:13 +0100
Subject: [PATCH] #1888 fixes import for ManifestoCanvas, re-adds padding for
thumbnail grid cell
---
src/components/ThumbnailNavigation.js | 11 +++++++++++
src/components/WindowSideBarCanvasPanel.js | 6 ++++++
2 files changed, 17 insertions(+)
diff --git a/src/components/ThumbnailNavigation.js b/src/components/ThumbnailNavigation.js
index 4bbc1430a..50e599d25 100644
--- a/src/components/ThumbnailNavigation.js
+++ b/src/components/ThumbnailNavigation.js
@@ -101,6 +101,7 @@ export class ThumbnailNavigation extends Component {
* canvases
*/
calculateScaledWidth(options) {
+<<<<<<< HEAD
const { config, canvasGroupings } = this.props;
const ret = canvasGroupings
.getCanvases(options.index)
@@ -120,6 +121,16 @@ export class ThumbnailNavigation extends Component {
return Math.ceil(window.canvasIndex / 2);
default:
return window.canvasIndex;
+=======
+ const { config, canvases } = this.props;
+ const canvas = new ManifestoCanvas(canvases[options.index]);
+ /*
+ if canvas provides valid dimensions return calculated width, based on height and aspectRatio,
+ otherweise return the default width
+ */
+ if (canvas.hasValidDimensions) {
+ return Math.floor(config.thumbnailNavigation.height * canvas.aspectRatio) + 8;
+>>>>>>> #1888 fixes import for ManifestoCanvas, re-adds padding for thumbnail grid cell
}
}
diff --git a/src/components/WindowSideBarCanvasPanel.js b/src/components/WindowSideBarCanvasPanel.js
index f5799eda8..d7da82832 100644
--- a/src/components/WindowSideBarCanvasPanel.js
+++ b/src/components/WindowSideBarCanvasPanel.js
@@ -4,8 +4,14 @@ import classNames from 'classnames';
import Typography from '@material-ui/core/Typography';
import List from '@material-ui/core/List';
import ListItem from '@material-ui/core/ListItem';
+<<<<<<< HEAD
import { CanvasThumbnail } from './CanvasThumbnail';
import ManifestoCanvas from '../lib/ManifestoCanvas';
+=======
+import { withStyles } from '@material-ui/core/styles';
+import ManifestoCanvas from '../lib/ManifestoCanvas';
+import CanvasThumbnail from './CanvasThumbnail';
+>>>>>>> #1888 fixes import for ManifestoCanvas, re-adds padding for thumbnail grid cell
import { getIdAndLabelOfCanvases } from '../state/selectors';
/**
--
GitLab