diff --git a/lib/gui/app/pages/main/controllers/drive-selection.js b/lib/gui/app/pages/main/controllers/drive-selection.js index 53cc8621..9fd4f04f 100644 --- a/lib/gui/app/pages/main/controllers/drive-selection.js +++ b/lib/gui/app/pages/main/controllers/drive-selection.js @@ -17,10 +17,12 @@ 'use strict' const _ = require('lodash') +const angular = require('angular') const settings = require('../../../models/settings') const selectionState = require('../../../../../shared/models/selection-state') const analytics = require('../../../modules/analytics') const exceptionReporter = require('../../../modules/exception-reporter') +const utils = require('../../../../../shared/utils') module.exports = function (DriveSelectorService) { /** @@ -97,4 +99,14 @@ module.exports = function (DriveSelectorService) { this.openDriveSelector() analytics.logEvent('Reselect drive') } + + /** + * @summary Get memoized selected drives + * @function + * @public + * + * @example + * DriveSelectionController.getMemoizedSelectedDrives() + */ + this.getMemoizedSelectedDrives = utils.memoize(selectionState.getSelectedDrives, angular.equals) } diff --git a/lib/gui/app/pages/main/styles/_main.scss b/lib/gui/app/pages/main/styles/_main.scss index 7617be89..45e8cdce 100644 --- a/lib/gui/app/pages/main/styles/_main.scss +++ b/lib/gui/app/pages/main/styles/_main.scss @@ -107,6 +107,17 @@ svg-icon > img[disabled] { margin-top: 1px; } +.page-main .step-drive.step-list { + &::-webkit-scrollbar { + width: 4px; + } + + &::-webkit-scrollbar-thumb { + background-color: $palette-theme-dark-disabled-foreground; + border-radius: 4px; + } +} + .page-main .glyphicon { vertical-align: text-top; } @@ -123,6 +134,13 @@ svg-icon > img[disabled] { color: $palette-theme-dark-disabled-foreground; } +.page-main .step-list { + height: 80px; + margin: 15px; + overflow-y: auto; + color: $palette-theme-dark-disabled-foreground; +} + .target-status-wrap { display: flex; position: absolute; diff --git a/lib/gui/app/pages/main/templates/main.tpl.html b/lib/gui/app/pages/main/templates/main.tpl.html index a2c81a1a..10a7b89b 100644 --- a/lib/gui/app/pages/main/templates/main.tpl.html +++ b/lib/gui/app/pages/main/templates/main.tpl.html @@ -84,6 +84,13 @@ ng-click="drive.reselectDrive()" ng-hide="main.state.isFlashing()">Change +