From 652bc085ca5766fcb139f72798f323167d295d8d Mon Sep 17 00:00:00 2001 From: anapnoe <124302297+anapnoe@users.noreply.github.com> Date: Thu, 11 May 2023 09:15:24 +0300 Subject: [PATCH] fix #136 added passive:false to touchmove --- javascript/ui.js | 16 +++++++++++----- scripts/postprocessing_upscale.py | 4 ++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/javascript/ui.js b/javascript/ui.js index 5f51e7c3..7f9d9182 100644 --- a/javascript/ui.js +++ b/javascript/ui.js @@ -1323,12 +1323,12 @@ onUiUpdate(function () { cached_clone_range = clone_range; } } - function ui_input_focus_handler(e) { + /* function ui_input_focus_handler(e) { if (e.target != focus_input) { focus_input = false; ui_input_release_handler(e); } - } + } */ function ui_input_release_handler(e) { const len = active_clone_input.length; @@ -1413,20 +1413,26 @@ onUiUpdate(function () { e.stopPropagation(); ui_input_release_handler(e); ui_input_touchmove_handler(e); - gcontainer.addEventListener("touchmove", ui_input_touchmove_handler); + gcontainer.addEventListener("touchmove", ui_input_touchmove_handler, { + passive: false, + }); gcontainer.addEventListener("touchend", ui_input_touchend_handler); }, 500); //gcontainer.addEventListener('contextmenu', slider_contextmenu); gcontainer.addEventListener("touchend", slider_touchend); - gcontainer.addEventListener("touchmove", slider_touchmove); + gcontainer.addEventListener("touchmove", slider_touchmove, { + passive: false, + }); } function ui_dispatch_input_release(value) { const gcontainer = gradioApp().querySelector(".gradio-container"); if (value) { gcontainer.addEventListener("mouseover", ui_input_release_handler); - gcontainer.addEventListener("touchstart", slider_touchstart); + gcontainer.addEventListener("touchstart", slider_touchstart, { + passive: false, + }); } else { gcontainer.removeEventListener("mouseover", ui_input_release_handler); gcontainer.removeEventListener("touchstart", slider_touchstart); diff --git a/scripts/postprocessing_upscale.py b/scripts/postprocessing_upscale.py index 6300b43d..511e7597 100644 --- a/scripts/postprocessing_upscale.py +++ b/scripts/postprocessing_upscale.py @@ -23,11 +23,11 @@ class ScriptPostprocessingUpscale(scripts_postprocessing.ScriptPostprocessing): with gr.TabItem('Scale by', elem_id="extras_scale_by_tab") as tab_scale_by: upscaling_resize = gr.Slider(minimum=1.0, maximum=8.0, step=0.05, label="Resize", value=4, elem_id="extras_upscaling_resize") with gr.TabItem('Scale to', elem_id="extras_scale_to_tab") as tab_scale_to: - with gr.Row(elem_id="upscaling_column_size", scale=4): + with gr.Row(elem_id="upscaling_column_size"): upscaling_resize_w = gr.Slider(minimum=64, maximum=2048, step=8, label="Width", value=512, elem_id="extras_upscaling_resize_w") upscaling_res_switch_btn = ToolButton(value=switch_values_symbol, elem_id="upscaling_res_switch_btn") upscaling_resize_h = gr.Slider(minimum=64, maximum=2048, step=8, label="Height", value=512, elem_id="extras_upscaling_resize_h") - with gr.Row(elem_id="upscaling_dimensions_row", scale=1, elem_classes="dimensions-tools"): + with gr.Row(elem_id="upscaling_dimensions_row", elem_classes="dimensions-tools"): upscaling_crop = gr.Checkbox(label='Crop to fit', value=True, elem_id="extras_upscaling_crop") with FormRow(): extras_upscaler_1 = gr.Dropdown(label='Upscaler 1', elem_id="extras_upscaler_1", choices=[x.name for x in shared.sd_upscalers], value=shared.sd_upscalers[0].name)