self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-16 00:14:34 +02:00
Code Issues Releases Activity

Desktop: Fixes #2865: Make sidebar resizable when note list is not displayed (#2895)

Browse Source 
Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
This commit is contained in:
anirudh murali
2020-05-15 16:50:56 +05:30
committed by GitHub
parent b3f32ffc59
commit ebe06c9c38
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ElectronClient/gui/MainScreen.jsx
View File

@ -605,7 +605,7 @@ class MainScreenComponent extends React.Component {
const rowHeight = height - theme.headerHeight - (messageBoxVisible ? this.styles_.messageBox.height : 0); const rowHeight = height - theme.headerHeight - (messageBoxVisible ? this.styles_.messageBox.height : 0);
this.styles_.verticalResizer = { this.styles_.verticalResizerSidebar = {
width: 5, width: 5,
// HACK: For unknown reasons, the resizers are just a little bit taller than the other elements, // HACK: For unknown reasons, the resizers are just a little bit taller than the other elements,
// making the whole window scroll vertically. So we remove 10 extra pixels here. // making the whole window scroll vertically. So we remove 10 extra pixels here.
@ -613,8 +613,10 @@ class MainScreenComponent extends React.Component {
display: 'inline-block', display: 'inline-block',
}; };
this.styles_.verticalResizerNotelist = Object.assign({}, this.styles_.verticalResizerSidebar);
this.styles_.sideBar = { this.styles_.sideBar = {
width: sidebarWidth - this.styles_.verticalResizer.width, width: sidebarWidth - this.styles_.verticalResizerSidebar.width,
height: rowHeight, height: rowHeight,
display: 'inline-block', display: 'inline-block',
verticalAlign: 'top', verticalAlign: 'top',
@ -623,10 +625,11 @@ class MainScreenComponent extends React.Component {
if (isSidebarVisible === false) { if (isSidebarVisible === false) {
this.styles_.sideBar.width = 0; this.styles_.sideBar.width = 0;
this.styles_.sideBar.display = 'none'; this.styles_.sideBar.display = 'none';
this.styles_.verticalResizerSidebar.display = 'none';
} }
this.styles_.noteList = { this.styles_.noteList = {
width: noteListWidth - this.styles_.verticalResizer.width, width: noteListWidth - this.styles_.verticalResizerNotelist.width,
height: rowHeight, height: rowHeight,
display: 'inline-block', display: 'inline-block',
verticalAlign: 'top', verticalAlign: 'top',
@ -635,7 +638,7 @@ class MainScreenComponent extends React.Component {
if (isNoteListVisible === false) { if (isNoteListVisible === false) {
this.styles_.noteList.width = 0; this.styles_.noteList.width = 0;
this.styles_.noteList.display = 'none'; this.styles_.noteList.display = 'none';
this.styles_.verticalResizer.display = 'none'; this.styles_.verticalResizerNotelist.display = 'none';
} }
this.styles_.noteText = { this.styles_.noteText = {
@ -874,9 +877,9 @@ class MainScreenComponent extends React.Component {
<Header style={styles.header} showBackButton={false} items={headerItems} /> <Header style={styles.header} showBackButton={false} items={headerItems} />
{messageComp} {messageComp}
<SideBar style={styles.sideBar} /> <SideBar style={styles.sideBar} />
<VerticalResizer style={styles.verticalResizer} onDrag={this.sidebar_onDrag} /> <VerticalResizer style={styles.verticalResizerSidebar} onDrag={this.sidebar_onDrag} />
<NoteList style={styles.noteList} /> <NoteList style={styles.noteList} />
<VerticalResizer style={styles.verticalResizer} onDrag={this.noteList_onDrag} /> <VerticalResizer style={styles.verticalResizerNotelist} onDrag={this.noteList_onDrag} />
<NoteEditor bodyEditor={bodyEditor} style={styles.noteText} /> <NoteEditor bodyEditor={bodyEditor} style={styles.noteText} />
{pluginDialog} {pluginDialog}
</div> </div>