mirror/stable-diffusion-webui
2
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2025-01-18 14:55:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

enable progressbar without gallery

Browse Source
This commit is contained in:
AUTOMATIC 2023-01-18 13:20:47 +03:00
parent dac59b9b07
commit d8f8bcb821
2 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
javascript/progressbar.js
View File

@ -130,7 +130,7 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
var dateStart = new Date() var dateStart = new Date()
var wasEverActive = false var wasEverActive = false
var parentProgressbar = progressbarContainer.parentNode var parentProgressbar = progressbarContainer.parentNode
var parentGallery = gallery.parentNode var parentGallery = gallery ? gallery.parentNode : null
var divProgress = document.createElement('div') var divProgress = document.createElement('div')
divProgress.className='progressDiv' divProgress.className='progressDiv'
@ -141,14 +141,16 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
divProgress.appendChild(divInner) divProgress.appendChild(divInner)
parentProgressbar.insertBefore(divProgress, progressbarContainer) parentProgressbar.insertBefore(divProgress, progressbarContainer)
var livePreview = document.createElement('div') if(parentGallery){
livePreview.className='livePreview' var livePreview = document.createElement('div')
parentGallery.insertBefore(livePreview, gallery) livePreview.className='livePreview'
parentGallery.insertBefore(livePreview, gallery)
}
var removeProgressBar = function(){ var removeProgressBar = function(){
setTitle("") setTitle("")
parentProgressbar.removeChild(divProgress) parentProgressbar.removeChild(divProgress)
parentGallery.removeChild(livePreview) if(parentGallery) parentGallery.removeChild(livePreview)
atEnd() atEnd()
} }
@ -168,6 +170,7 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
progressText = "" progressText = ""
divInner.style.width = ((res.progress || 0) * 100.0) + '%' divInner.style.width = ((res.progress || 0) * 100.0) + '%'
divInner.style.background = res.progress ? "" : "transparent"
if(res.progress > 0){ if(res.progress > 0){
progressText = ((res.progress || 0) * 100.0).toFixed(0) + '%' progressText = ((res.progress || 0) * 100.0).toFixed(0) + '%'
@ -175,11 +178,15 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
if(res.eta){ if(res.eta){
progressText += " ETA: " + formatTime(res.eta) progressText += " ETA: " + formatTime(res.eta)
} else if(res.textinfo){
progressText += " " + res.textinfo
} }
setTitle(progressText) setTitle(progressText)
if(res.textinfo && res.textinfo.indexOf("\n") == -1){
progressText = res.textinfo + " " + progressText
}
divInner.textContent = progressText divInner.textContent = progressText
var elapsedFromStart = (new Date() - dateStart) / 1000 var elapsedFromStart = (new Date() - dateStart) / 1000
@ -197,8 +204,7 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
} }
if(res.live_preview){ if(res.live_preview && gallery){
var rect = gallery.getBoundingClientRect() var rect = gallery.getBoundingClientRect()
if(rect.width){ if(rect.width){
livePreview.style.width = rect.width + "px" livePreview.style.width = rect.width + "px"

19
style.css
View File

@ -290,26 +290,12 @@ input[type="range"]{
min-height: unset !important; min-height: unset !important;
} }
#txt2img_progressbar, #img2img_progressbar, #ti_progressbar{
position: absolute;
z-index: 1000;
right: 0;
padding-left: 5px;
padding-right: 5px;
display: block;
}
#txt2img_progress_row, #img2img_progress_row{
margin-bottom: 10px;
margin-top: -18px;
}
.progressDiv{ .progressDiv{
position: absolute; position: absolute;
height: 20px; height: 20px;
top: -20px; top: -20px;
background: #b4c0cc; background: #b4c0cc;
border-radius: 8px !important; border-radius: 3px !important;
} }
.dark .progressDiv{ .dark .progressDiv{
@ -325,9 +311,10 @@ input[type="range"]{
line-height: 20px; line-height: 20px;
padding: 0 8px 0 0; padding: 0 8px 0 0;
text-align: right; text-align: right;
border-radius: 8px; border-radius: 3px;
overflow: visible; overflow: visible;
white-space: nowrap; white-space: nowrap;
padding: 0 0.5em;
} }
.livePreview{ .livePreview{