From 0cb6fc8f259d54b26be6e89f1d375ade2772fc77 Mon Sep 17 00:00:00 2001 From: hax0kartik Date: Wed, 19 Feb 2020 08:43:17 -0800 Subject: [PATCH 1/3] Add option to disable scrollbar --- browser/components/MarkdownPreview.js | 5 +++++ browser/main/index.js | 7 +++++++ browser/main/lib/ConfigManager.js | 1 + browser/main/modals/PreferencesModal/UiTab.js | 16 ++++++++++++++-- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js index 75635c89b..d7b940342 100755 --- a/browser/components/MarkdownPreview.js +++ b/browser/components/MarkdownPreview.js @@ -23,6 +23,7 @@ import Carousel from 'react-image-carousel' import ConfigManager from '../main/lib/ConfigManager' import uiThemes from 'browser/lib/ui-themes' import i18n from 'browser/lib/i18n' +import config from 'browser/main/lib/ConfigManager' const { remote, shell } = require('electron') const attachmentManagement = require('../main/lib/dataApi/attachmentManagement') @@ -186,10 +187,12 @@ ${allowCustomCSS ? customCSS : ''} const scrollBarStyle = ` ::-webkit-scrollbar { + ${config.get().ui.showScrollBar ? '' : 'display: none;'} width: 12px; } ::-webkit-scrollbar-thumb { + ${config.get().ui.showScrollBar ? '' : 'display: none;'} background-color: rgba(0, 0, 0, 0.15); } @@ -199,10 +202,12 @@ const scrollBarStyle = ` ` const scrollBarDarkStyle = ` ::-webkit-scrollbar { + ${config.get().ui.showScrollBar ? '' : 'display: none;'} width: 12px; } ::-webkit-scrollbar-thumb { + ${config.get().ui.showScrollBar ? '' : 'display: none;'} background-color: rgba(0, 0, 0, 0.3); } diff --git a/browser/main/index.js b/browser/main/index.js index 727c4d0de..789f3b0b6 100644 --- a/browser/main/index.js +++ b/browser/main/index.js @@ -7,6 +7,7 @@ require('!!style!css!stylus?sourceMap!./global.styl') import { Route, Switch, Redirect } from 'react-router-dom' import { ConnectedRouter } from 'connected-react-router' import DevTools from './DevTools' +import config from 'browser/main/lib/ConfigManager' require('./lib/ipcClient') require('../lib/customMeta') @@ -77,6 +78,12 @@ document.addEventListener('click', function(e) { if (infoPanel) infoPanel.style.display = 'none' }) +if (!config.get().ui.showScrollBar) { + document.styleSheets[54].insertRule('::-webkit-scrollbar {display: none}') + document.styleSheets[54].insertRule('::-webkit-scrollbar-corner {display: none}') + document.styleSheets[54].insertRule('::-webkit-scrollbar-thumb {display: none}') +} + const el = document.getElementById('content') function notify(...args) { diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js index 6a950af11..d4c1fba56 100644 --- a/browser/main/lib/ConfigManager.js +++ b/browser/main/lib/ConfigManager.js @@ -48,6 +48,7 @@ export const DEFAULT_CONFIG = { theme: 'default', showCopyNotification: true, disableDirectWrite: false, + showScrollBar: true, defaultNote: 'ALWAYS_ASK', // 'ALWAYS_ASK', 'SNIPPET_NOTE', 'MARKDOWN_NOTE' showMenuBar: false }, diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js index e043397de..9ae775e1e 100644 --- a/browser/main/modals/PreferencesModal/UiTab.js +++ b/browser/main/modals/PreferencesModal/UiTab.js @@ -96,7 +96,8 @@ class UiTab extends React.Component { enableLiveNoteCounts: this.refs.enableLiveNoteCounts.checked, showMenuBar: this.refs.showMenuBar.checked, disableDirectWrite: - this.refs.uiD2w != null ? this.refs.uiD2w.checked : false + this.refs.uiD2w != null ? this.refs.uiD2w.checked : false, + showScrollBar: this.refs.showScrollBar.checked }, editor: { theme: this.refs.editorTheme.value, @@ -351,7 +352,18 @@ class UiTab extends React.Component { ) : null} - +
+ +
Tags
From 3b5525b1548c42153951cb683087ce9115d6d3b6 Mon Sep 17 00:00:00 2001 From: hax0kartik Date: Wed, 19 Feb 2020 08:59:59 -0800 Subject: [PATCH 2/3] fixes to code style --- browser/main/index.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/browser/main/index.js b/browser/main/index.js index 789f3b0b6..91da842a9 100644 --- a/browser/main/index.js +++ b/browser/main/index.js @@ -80,9 +80,14 @@ document.addEventListener('click', function(e) { if (!config.get().ui.showScrollBar) { document.styleSheets[54].insertRule('::-webkit-scrollbar {display: none}') - document.styleSheets[54].insertRule('::-webkit-scrollbar-corner {display: none}') - document.styleSheets[54].insertRule('::-webkit-scrollbar-thumb {display: none}') -} + document.styleSheets[54].insertRule( + '::-webkit-scrollbar-corner {display: none}' + ) + + document.styleSheets[54].insertRule( + '::-webkit-scrollbar-thumb {display: none}' + ) + } const el = document.getElementById('content') From 7250893590f2fe5ce1208efeed7baf9c9fdc19f7 Mon Sep 17 00:00:00 2001 From: hax0kartik Date: Wed, 19 Feb 2020 09:02:11 -0800 Subject: [PATCH 3/3] more fixes to code style --- browser/main/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/main/index.js b/browser/main/index.js index 91da842a9..0ed9cdbe8 100644 --- a/browser/main/index.js +++ b/browser/main/index.js @@ -83,11 +83,11 @@ if (!config.get().ui.showScrollBar) { document.styleSheets[54].insertRule( '::-webkit-scrollbar-corner {display: none}' ) - + document.styleSheets[54].insertRule( '::-webkit-scrollbar-thumb {display: none}' ) - } +} const el = document.getElementById('content')