From addf9b920f4572f7979797556fb4a35b7d31d1ff Mon Sep 17 00:00:00 2001 From: hikerpig Date: Sun, 21 Jul 2019 14:43:59 +0800 Subject: [PATCH] tweak MarkdownPreview style to optimize overflow scrollbar display, fix #2902 --- browser/components/MarkdownPreview.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js index 11d8dca6..4c56125b 100755 --- a/browser/components/MarkdownPreview.js +++ b/browser/components/MarkdownPreview.js @@ -53,6 +53,7 @@ function buildStyle ( codeBlockFontFamily, lineNumber, scrollPastEnd, + optimizeOverflowScroll, theme, allowCustomCSS, customCSS @@ -86,12 +87,14 @@ function buildStyle ( url('${appPath}/resources/fonts/MaterialIcons-Regular.woff') format('woff'), url('${appPath}/resources/fonts/MaterialIcons-Regular.ttf') format('truetype'); } + ${markdownStyle} body { font-family: '${fontFamily.join("','")}'; font-size: ${fontSize}px; - ${scrollPastEnd && 'padding-bottom: 90vh;'} + ${scrollPastEnd ? 'padding-bottom: 90vh;' : ''} + ${optimizeOverflowScroll ? 'height: 100%;' : ''} } @media print { body { @@ -341,6 +344,7 @@ export default class MarkdownPreview extends React.Component { codeBlockFontFamily, lineNumber, scrollPastEnd, + false, theme, allowCustomCSS, customCSS @@ -663,16 +667,19 @@ export default class MarkdownPreview extends React.Component { this.getWindow().document.getElementById( 'codeTheme' ).href = this.GetCodeThemeLink(codeBlockTheme) + this.getWindow().document.getElementById('style').innerHTML = buildStyle( fontFamily, fontSize, codeBlockFontFamily, lineNumber, scrollPastEnd, + true, theme, allowCustomCSS, - customCSS + customCSS, ) + this.getWindow().document.documentElement.style.overflowY = 'hidden' } GetCodeThemeLink (name) {