Merge pull request #350 from Edirom/feature/renderingView-sass

improve: renderingView fitting to window
Edirom · Feb 6, 2024 · 706d3ab · 706d3ab
2 parents 600f11b + a0c617b
commit 706d3ab
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 16 deletions.
diff --git a/app/view/window/image/VerovioImage.js b/app/view/window/image/VerovioImage.js
@@ -18,36 +18,36 @@
  */
 Ext.define('EdiromOnline.view.window.image.VerovioImage', {
 	extend: 'Ext.panel.Panel',
-	
+
 	layout: 'fit',
-	
+
 	initComponent: function () {
-		
+
 		var me = this;
-		
-		me.html = '<div id="' + me.id + '_rendCont" style="height:100%;"><iframe id="' + me.id +
-		'_rendContIFrame" style="width:100%; height:100%; border:none; background-color:white;"></iframe></div>';
-		
+
+		me.html = '<div id="' + me.id + '_rendCont" class="renderingViewContent"><iframe id="' + me.id +
+		'_rendContIFrame"></iframe></div>';
+
 		me.callParent();
 	},
-	
+
 	setIFrameURL: function (url) {
 		var me = this;
 		var contEl = me.el.getById(me.id + '_rendContIFrame');
 		contEl.set({
 			'src': url
 		});
-		
+
 	},
-	
+
 	showMovement: function (movementId) {
 		var me = this;
-		
+
 		var iframe = Ext.fly(me.id + '_rendContIFrame').dom.contentWindow;
 		iframe.showMovement(movementId);
 	},
-	
-    /* 
+
+    /*
      * Call showMeasure of corresponding iframe.
      * @param {string} movementId - The XML-ID of the selected movement.
      * @param {string} measureId - The XML-ID of the selected measure.

diff --git a/packages/eoTheme/sass/etc/all.scss b/packages/eoTheme/sass/etc/all.scss
@@ -1,11 +1,11 @@
-@import 'webfonts.scss';	
+@import 'webfonts.scss';
 @import 'mixins.scss';
 
 /*Edirom*/
 @import 'facsimile.scss';
 @import 'xml.scss';
 @import 'toolbar.scss';
- 
+
 //@import 'textViewContent.scss';
 @import 'textView.scss';
 @import 'headerView.scss';
@@ -16,4 +16,7 @@
 @import 'freidi.scss';
 
 /*Annotations*/
-@import 'annotation.scss';
+@import 'annotation.scss';
+
+/*renderingView (Verovio)*/
+@import 'renderingViewContent.scss'
diff --git a/packages/eoTheme/sass/etc/renderingViewContent.scss b/packages/eoTheme/sass/etc/renderingViewContent.scss
@@ -0,0 +1,7 @@
+/* make verovio iFrame fit Edirom window */
+.renderingViewContent, .renderingViewContent iframe {
+    width: 100%;
+    height: 100%;
+    border: none;
+    overflow: hidden;
+}