Fix Enqueue button not appearing in compact prompt layout

pull/226/head
MMP0 2024-03-07 18:56:31 +09:00
parent d23a705577
commit 20bed846bb
3 changed files with 15 additions and 12 deletions

View File

@ -90,6 +90,7 @@ class Script(scripts.Script):
def after_component(self, component, **_kwargs): def after_component(self, component, **_kwargs):
generate_id = "txt2img_generate" if self.is_txt2img else "img2img_generate" generate_id = "txt2img_generate" if self.is_txt2img else "img2img_generate"
generate_box = "txt2img_generate_box" if self.is_txt2img else "img2img_generate_box"
actions_column_id = "txt2img_actions_column" if self.is_txt2img else "img2img_actions_column" actions_column_id = "txt2img_actions_column" if self.is_txt2img else "img2img_actions_column"
neg_id = "txt2img_neg_prompt" if self.is_txt2img else "img2img_neg_prompt" neg_id = "txt2img_neg_prompt" if self.is_txt2img else "img2img_neg_prompt"
toprow_id = "txt2img_toprow" if self.is_txt2img else "img2img_toprow" toprow_id = "txt2img_toprow" if self.is_txt2img else "img2img_toprow"
@ -106,11 +107,15 @@ class Script(scripts.Script):
if component.elem_id == generate_id: if component.elem_id == generate_id:
self.generate_button = component self.generate_button = component
if getattr(shared.opts, "queue_button_placement", placement_under_generate) == placement_under_generate: if getattr(shared.opts, "compact_prompt_box", False):
add_enqueue_row(actions_column_id) add_enqueue_row(generate_box)
else:
if getattr(shared.opts, "queue_button_placement", placement_under_generate) == placement_under_generate:
add_enqueue_row(actions_column_id)
elif component.elem_id == neg_id: elif component.elem_id == neg_id:
if getattr(shared.opts, "queue_button_placement", placement_under_generate) == placement_between_prompt_and_generate: if not getattr(shared.opts, "compact_prompt_box", False):
add_enqueue_row(toprow_id) if getattr(shared.opts, "queue_button_placement", placement_under_generate) == placement_between_prompt_and_generate:
add_enqueue_row(toprow_id)
def on_app_started(self, block): def on_app_started(self, block):
if self.generate_button is not None: if self.generate_button is not None:

File diff suppressed because one or more lines are too long

View File

@ -375,7 +375,7 @@ button.ts-btn-action {
min-width: 210px; min-width: 210px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 0; gap: calc(var(--layout-gap) / 2);
> div:first-child { > div:first-child {
flex-direction: row; flex-direction: row;
@ -383,14 +383,12 @@ button.ts-btn-action {
align-items: stretch; align-items: stretch;
flex: 0 0 auto; flex: 0 0 auto;
flex-grow: unset !important; flex-grow: unset !important;
margin-bottom: calc(var(--layout-gap) / 2);
} }
}
.gradio-button, :not(#txt2img_generate_box) > #txt2img_enqueue_wrapper,
.gradio-dropdown .wrap-inner { :not(#img2img_generate_box) > #img2img_enqueue_wrapper {
min-height: 36px; align-self: flex-start;
max-height: 42px;
}
} }
#img2img_toprow .interrogate-col.has-queue-button { #img2img_toprow .interrogate-col.has-queue-button {