From a0114de9e9aae92f1cde31bc21752c60e45fd113 Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Thu, 23 May 2024 01:21:08 +0200 Subject: [PATCH] feat: change preset from option to select, add accordion for resolution --- css/style.css | 6 +++++- webui.py | 29 ++++++++++++++--------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/css/style.css b/css/style.css index c702a725..8bcb9ed3 100644 --- a/css/style.css +++ b/css/style.css @@ -101,10 +101,14 @@ progress::after { overflow: auto !important; } -.aspect_ratios label { +.performance_selection label { width: 140px !important; } +.aspect_ratios label { + flex: calc(50% - 5px) !important; +} + .aspect_ratios label span { white-space: nowrap !important; } diff --git a/webui.py b/webui.py index 21545057..873c7e75 100644 --- a/webui.py +++ b/webui.py @@ -257,25 +257,24 @@ with shared.gradio_root: with gr.Column(scale=1, visible=modules.config.default_advanced_checkbox) as advanced_column: with gr.Tab(label='Setting'): - with gr.Row(): - if not args_manager.args.disable_preset_selection: - preset_selection = gr.Dropdown(label='Preset', - choices=modules.config.available_presets, - value=args_manager.args.preset if args_manager.args.preset else "initial", - interactive=True, scale=3) - performance_selection = gr.Dropdown(label='Performance', - choices=flags.Performance.list(), - value=modules.config.default_performance, scale=1) - with gr.Accordion('Resolution'): + if not args_manager.args.disable_preset_selection: + preset_selection = gr.Dropdown(label='Preset', + choices=modules.config.available_presets, + value=args_manager.args.preset if args_manager.args.preset else "initial", + interactive=True) + performance_selection = gr.Radio(label='Performance', + choices=flags.Performance.list(), + value=modules.config.default_performance, + elem_classes=['performance_selection']) + with gr.Accordion('Resolution', open=False): aspect_ratios_selection = gr.Radio(label='Aspect Ratios', choices=modules.config.available_aspect_ratios, value=modules.config.default_aspect_ratio, info='width × height', elem_classes='aspect_ratios') - with gr.Row(): - output_format = gr.Dropdown(label='Output Format', - choices=flags.OutputFormat.list(), - value=modules.config.default_output_format, scale=1) - image_number = gr.Slider(label='Image Number', minimum=1, maximum=modules.config.default_max_image_number, step=1, value=modules.config.default_image_number, scale=3) + output_format = gr.Radio(label='Output Format', + choices=flags.OutputFormat.list(), + value=modules.config.default_output_format) + image_number = gr.Slider(label='Image Number', minimum=1, maximum=modules.config.default_max_image_number, step=1, value=modules.config.default_image_number, scale=3) negative_prompt = gr.Textbox(label='Negative Prompt', show_label=True, placeholder="Type prompt here.", info='Describing what you do not want to see.', lines=2,