Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions data/scripts/components/config-panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,15 @@ define(function(require, exports) {
offState: 'Same tab',
});

ToggleOptionConfig({
parent: section,
name: 'Show scroll bar',
key: 'show.scroll.bar',
type: 'switch',
onState: 'Show',
offState: 'Hide',
});

ToggleOptionConfig({
parent: section,
type: 'switch',
Expand Down
2 changes: 1 addition & 1 deletion data/scripts/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ define(function(require, exports) {

// General settings
getConfigValue('context.menu.icons', true);

getConfigValue('show.scroll.bar', true);
getConfigValue('trashcan.hide', true);
getConfigValue('trashcan.hide-count', 0);
getConfigValue('undo.events', []);
Expand Down
6 changes: 6 additions & 0 deletions data/scripts/session-sync-ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ define(function(require, exports) {
var DomElem = HTMLCreator();

document.body.setAttribute('panel', AppConfig.isPanel());
document.body.setAttribute('scrollbar', AppConfig.get('general.showScrollbar'));
var content = document.getElementById('body');

// ------------------------------------------------------------------------
Expand Down Expand Up @@ -428,6 +429,11 @@ define(function(require, exports) {
document.body.style.height = size + 'px';
});

// Handle scrollbar visibility setting
AppConfig.onChange('show.scroll.bar', function (value) {
document.body.setAttribute('scrollbar', value ? 'show' : 'hide');
});

resizeHandle.addEventListener('mousedown', startResize);
}
else
Expand Down
39 changes: 38 additions & 1 deletion data/session-sync.css
Original file line number Diff line number Diff line change
Expand Up @@ -1431,7 +1431,14 @@
flex: 1;
}

#session-sync .session-container .bookmarks:hover {
/* When scrollbar is enabled, use standard width to show it */
#session-sync[scrollbar="show"] .session-container .bookmarks {
width: 100%;
overflow-y: hidden;
}

/* Show the scrollbar on hover */
#session-sync[scrollbar="show"] .session-container .bookmarks:hover {
overflow-y: scroll;
}

Expand Down Expand Up @@ -2039,6 +2046,14 @@
background: url("images/icons/frames.png") no-repeat center;
}

#session-sync .session-toolbar .menu-bar .repalce-session-all {
background: url("images/material_icons/repeat.svg") no-repeat center;
}

#session-sync .session-toolbar .menu-bar .repalce-session {
background: url("images/material_icons/repeat_one.svg") no-repeat center;
}

#session-sync .session-toolbar .menu-bar .fix-session {
background: url("images/icons/tools.png") no-repeat center;
}
Expand Down Expand Up @@ -2216,6 +2231,17 @@
flex: 0;
}

/* When scrollbar is enabled, use standard width to show it */
#session-sync[scrollbar="show"] .sessions .history-list {
width: 100%;
overflow-y: hidden;
}

/* Show the scrollbar on hover */
#session-sync[scrollbar="show"] .sessions .history-list:hover {
overflow-y: scroll;
}

#session-sync .sessions .history-node {
width: 100%;
height: 2.5em;
Expand Down Expand Up @@ -2265,6 +2291,17 @@
flex: 1;
}

/* When scrollbar is enabled, use standard width to show it */
#session-sync[scrollbar="show"] .sessions .session-list {
width: 100%;
overflow-y: hidden;
}

/* Show the scrollbar on hover */
#session-sync[scrollbar="show"] .sessions .session-list:hover {
overflow-y: scroll;
}

/*
* Style Folder Session
*/
Expand Down