mirror of
https://github.com/upscayl/upscayl.git
synced 2024-11-12 01:40:53 +01:00
Merge branch 'main' into fix-react-infinite-loop
This commit is contained in:
commit
af95c76fa7
@ -584,7 +584,8 @@ const Home = () => {
|
|||||||
onDragOver={(e) => handleDragOver(e)}
|
onDragOver={(e) => handleDragOver(e)}
|
||||||
onDragEnter={(e) => handleDragEnter(e)}
|
onDragEnter={(e) => handleDragEnter(e)}
|
||||||
onDragLeave={(e) => handleDragLeave(e)}
|
onDragLeave={(e) => handleDragLeave(e)}
|
||||||
onPaste={(e) => handlePaste(e)}>
|
onPaste={(e) => handlePaste(e)}
|
||||||
|
>
|
||||||
{progress.length > 0 &&
|
{progress.length > 0 &&
|
||||||
upscaledImagePath.length === 0 &&
|
upscaledImagePath.length === 0 &&
|
||||||
upscaledBatchFolderPath.length === 0 &&
|
upscaledBatchFolderPath.length === 0 &&
|
||||||
@ -630,11 +631,7 @@ const Home = () => {
|
|||||||
<img
|
<img
|
||||||
src={
|
src={
|
||||||
"file://" +
|
"file://" +
|
||||||
`${
|
`${upscaledImagePath ? upscaledImagePath : imagePath}`
|
||||||
upscaledImagePath
|
|
||||||
? upscaledImagePath
|
|
||||||
: imagePath
|
|
||||||
}`
|
|
||||||
}
|
}
|
||||||
onLoad={(e: any) => {
|
onLoad={(e: any) => {
|
||||||
setDimensions({
|
setDimensions({
|
||||||
@ -666,7 +663,8 @@ const Home = () => {
|
|||||||
</p>
|
</p>
|
||||||
<button
|
<button
|
||||||
className="bg-gradient-blue rounded-lg p-3 font-medium text-white/90 transition-colors"
|
className="bg-gradient-blue rounded-lg p-3 font-medium text-white/90 transition-colors"
|
||||||
onClick={openFolderHandler}>
|
onClick={openFolderHandler}
|
||||||
|
>
|
||||||
Open Upscayled Folder
|
Open Upscayled Folder
|
||||||
</button>
|
</button>
|
||||||
</>
|
</>
|
||||||
|
Loading…
Reference in New Issue
Block a user