Merge remote-tracking branch 'origin/master'

This commit is contained in:
YouROK
2021-06-03 15:47:46 +03:00
2 changed files with 7 additions and 4 deletions

View File

@@ -66,8 +66,9 @@ const TorrentCache = memo(
return ( return (
<Measure bounds onResize={({ bounds }) => setDimensions(bounds)}> <Measure bounds onResize={({ bounds }) => setDimensions(bounds)}>
{({ measureRef }) => ( {({ measureRef }) => (
<div style={{ display: 'flex', flexDirection: 'column' }} ref={measureRef}> <div style={{ display: 'flex', flexDirection: 'column' }}>
<DialogContent <DialogContent
ref={measureRef}
{...(isMini {...(isMini
? { style: { padding: 0, maxHeight: `${miniCacheMaxHeight}px`, overflow: 'auto' } } ? { style: { padding: 0, maxHeight: `${miniCacheMaxHeight}px`, overflow: 'auto' } }
: { style: { padding: 0 } })} : { style: { padding: 0 } })}

View File

@@ -237,7 +237,9 @@ export default function SettingsDialog() {
/> />
<br /> <br />
<FormControlLabel <FormControlLabel
control={<Switch checked={RemoveCacheOnDrop} onChange={inputForm} id='RemoveCacheOnDrop' color='primary' />} control={
<Switch checked={RemoveCacheOnDrop} onChange={inputForm} id='RemoveCacheOnDrop' color='primary' />
}
label='Remove cache from disk on drop torrent' label='Remove cache from disk on drop torrent'
/> />
<br /> <br />