From 3992ecbe6e46a465062508c677964534e7397f72 Mon Sep 17 00:00:00 2001
From: Mitchell Boot <47387831+Mitchell1711@users.noreply.github.com>
Date: Fri, 6 Jan 2023 18:02:46 +0100
Subject: [PATCH 1/3] Added UI elements

Added a new row to hires fix that shows the new resolution after scaling
---
 modules/ui.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/ui.py b/modules/ui.py
index b79d24ee..20f7d2a2 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -255,6 +255,12 @@ def add_style(name: str, prompt: str, negative_prompt: str):
 
     return [gr.Dropdown.update(visible=True, choices=list(shared.prompt_styles.styles)) for _ in range(4)]
 
+def calc_resolution_hires(x, y, scale):
+    #final res can only be a multiple of 8
+    scaled_x = int(x * scale // 8) * 8
+    scaled_y = int(y * scale // 8) * 8
+    
+    return "<p style='margin: -1em 0em 0.7em 1.35em'>Upscaled Resolution: "+str(scaled_x)+"x"+str(scaled_y)+"</p>"
 
 def apply_styles(prompt, prompt_neg, style1_name, style2_name):
     prompt = shared.prompt_styles.apply_styles_to_prompt(prompt, [style1_name, style2_name])
@@ -718,6 +724,12 @@ def create_ui():
                                 hr_scale = gr.Slider(minimum=1.0, maximum=4.0, step=0.05, label="Upscale by", value=2.0, elem_id="txt2img_hr_scale")
                                 hr_resize_x = gr.Slider(minimum=0, maximum=2048, step=8, label="Resize width to", value=0, elem_id="txt2img_hr_resize_x")
                                 hr_resize_y = gr.Slider(minimum=0, maximum=2048, step=8, label="Resize height to", value=0, elem_id="txt2img_hr_resize_y")
+                            
+                            with FormRow(elem_id="txt2img_hires_fix_row3"):        
+                                hr_final_resolution = gr.HTML(value=calc_resolution_hires(width.value, height.value, hr_scale.value), elem_id="txtimg_hr_finalres")
+                                hr_scale.change(fn=calc_resolution_hires, inputs=[width, height, hr_scale], outputs=hr_final_resolution, show_progress=False)
+                                width.change(fn=calc_resolution_hires, inputs=[width, height, hr_scale], outputs=hr_final_resolution, show_progress=False)
+                                height.change(fn=calc_resolution_hires, inputs=[width, height, hr_scale], outputs=hr_final_resolution, show_progress=False)
 
                     elif category == "batch":
                         if not opts.dimensions_and_batch_together:

From 991368c8d54404d8e13d4c6e76a0f32644e65ad4 Mon Sep 17 00:00:00 2001
From: Mitchell Boot <47387831+Mitchell1711@users.noreply.github.com>
Date: Fri, 6 Jan 2023 18:24:29 +0100
Subject: [PATCH 2/3] remove camelcase

---
 modules/ui.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ui.py b/modules/ui.py
index 20f7d2a2..6fc8b7d7 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -260,7 +260,7 @@ def calc_resolution_hires(x, y, scale):
     scaled_x = int(x * scale // 8) * 8
     scaled_y = int(y * scale // 8) * 8
     
-    return "<p style='margin: -1em 0em 0.7em 1.35em'>Upscaled Resolution: "+str(scaled_x)+"x"+str(scaled_y)+"</p>"
+    return "<p style='margin: -1em 0em 0.7em 1.35em'>Upscaled resolution: "+str(scaled_x)+"x"+str(scaled_y)+"</p>"
 
 def apply_styles(prompt, prompt_neg, style1_name, style2_name):
     prompt = shared.prompt_styles.apply_styles_to_prompt(prompt, [style1_name, style2_name])

From f94cfc563bbedd923d5e95563a5e8d93c8516ac3 Mon Sep 17 00:00:00 2001
From: Mitchell Boot <47387831+Mitchell1711@users.noreply.github.com>
Date: Sat, 7 Jan 2023 01:15:22 +0100
Subject: [PATCH 3/3] Changed HTML to textbox instead

Using HTML caused an issue where the row would expand for a frame when changing the sliders because of the loading animation. This solution also doesn't use any additional HTML padding
---
 modules/ui.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/ui.py b/modules/ui.py
index 6fc8b7d7..6ea1b5d7 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -260,7 +260,7 @@ def calc_resolution_hires(x, y, scale):
     scaled_x = int(x * scale // 8) * 8
     scaled_y = int(y * scale // 8) * 8
     
-    return "<p style='margin: -1em 0em 0.7em 1.35em'>Upscaled resolution: "+str(scaled_x)+"x"+str(scaled_y)+"</p>"
+    return str(scaled_x)+"x"+str(scaled_y)
 
 def apply_styles(prompt, prompt_neg, style1_name, style2_name):
     prompt = shared.prompt_styles.apply_styles_to_prompt(prompt, [style1_name, style2_name])
@@ -726,7 +726,10 @@ def create_ui():
                                 hr_resize_y = gr.Slider(minimum=0, maximum=2048, step=8, label="Resize height to", value=0, elem_id="txt2img_hr_resize_y")
                             
                             with FormRow(elem_id="txt2img_hires_fix_row3"):        
-                                hr_final_resolution = gr.HTML(value=calc_resolution_hires(width.value, height.value, hr_scale.value), elem_id="txtimg_hr_finalres")
+                                hr_final_resolution = gr.Textbox(value=calc_resolution_hires(width.value, height.value, hr_scale.value), 
+                                    elem_id="txtimg_hr_finalres", 
+                                    label="Upscaled resolution",
+                                    interactive=False)
                                 hr_scale.change(fn=calc_resolution_hires, inputs=[width, height, hr_scale], outputs=hr_final_resolution, show_progress=False)
                                 width.change(fn=calc_resolution_hires, inputs=[width, height, hr_scale], outputs=hr_final_resolution, show_progress=False)
                                 height.change(fn=calc_resolution_hires, inputs=[width, height, hr_scale], outputs=hr_final_resolution, show_progress=False)