Skip to content

Adding Multi-Select + Image Comparison #1345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jtreminio wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Adding Multi-Select + Image Comparison #1345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Pages/Text2Image.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
<script src="js/genpage/gentab/layout.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/helpers/metadatahelpers.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/gentab/generatecontrols.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/gentab/multiselect.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/gentab/currentimagehandler.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/gentab/outputhistory.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/main.js?vary=@Utilities.VaryID"></script>
Expand Down
26 changes: 26 additions & 0 deletions src/Pages/_Generate/GenerateTab.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,18 @@
</span>
</div>
</div>
<div class="multiselect-tools-panel" id="multiselect_tools_panel">
<div class="multiselect-tools-header">
<span class="translate">Multi-Select</span>
<div class="multiselect-tools-actions">
<button class="basic-button translate" type="button" onclick="clearMultiSelectSelection()">Clear</button>
<button class="basic-button translate" type="button" onclick="toggleMultiSelectMode()">Done</button>
</div>
</div>
<div class="multiselect-tools-summary" id="multiselect_tools_summary"></div>
<div class="multiselect-tools-hint" id="multiselect_tools_hint"></div>
<div class="multiselect-tools-list" id="multiselect_tools_list"></div>
</div>
<div id="current_image_batch" class="current_image_batch_core"></div>
</div>
</div>
Expand Down Expand Up @@ -140,6 +152,7 @@
<div class="sui_popover_model_button translate" onclick="genTabLayout.resetLayout()">Reset Page Layout</div>
<div class="sui_popover_model_button translate" onclick="refreshParameterValues(true)">Reload Parameter Values</div>
<div class="sui_popover_model_button translate" onclick="resetParamsToDefault()">Reset Params to Default</div>
<div class="sui_popover_model_button translate" onclick="toggleMultiSelectMode()">Multi-Select</div>
<div class="sui_popover_model_button translate" onclick="openEmptyEditor()">Open Empty Image Editor</div>
<div class="sui_popover_model_button translate" onclick="mainGenHandler.doInterrupt()">Interrupt Current Session</div>
<div class="sui_popover_model_button translate" onclick="mainGenHandler.doInterrupt(true)">Interrupt All Sessions</div>
Expand Down Expand Up @@ -197,6 +210,19 @@
<span class="text_button translate" onclick="imageFullView.close()">[Close]</span><br>
</div>
</div>
<div class="modal modal-fullscreen imageview_popup_modal_background" id="image_compare_modal" data-bs-keyboard="false">
<div class="modal-dialog" style="display:none"></div>
<div class="imageview_modal_inner_div image-compare-modal-inner">
<div class="imageview_modal_imagewrap image-compare-modal-imagewrap">
<div class="image-compare-stage image-compare-stage-side" id="image_compare_stage"></div>
</div>
<div class="imageview_popup_modal_undertext image-compare-undertext">
<div class="image_fullview_extra_buttons image-compare-controls">
<div class="image-compare-mode-buttons" id="image_compare_mode_buttons"></div>
</div>
</div>
</div>
</div>
<div class="tab-pane genpage-bottom-tab" id="Presets-Tab" role="tabpanel">
<div class="browser_container preset_list_container" id="preset_list"></div>
<div class="sui-popover sui_popover_model" id="popover_presetmenu">
Expand Down
276 changes: 276 additions & 0 deletions src/wwwroot/css/genpage.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,6 +809,282 @@ body {
overflow: hidden;
margin: auto;
}
.multiselect-tools-panel {
display: none;
margin: 0.5rem 0 0.75rem 0;
padding: 0.75rem;
border-radius: 0.5rem;
border: 1px solid var(--light-border);
background-color: var(--background-soft);
}
.multiselect-tools-panel.multiselect-tools-panel-visible {
display: block;
}
.multiselect-tools-header {
display: flex;
align-items: center;
justify-content: space-between;
gap: 0.5rem;
margin-bottom: 0.5rem;
}
.multiselect-tools-actions {
display: flex;
flex-wrap: wrap;
gap: 0.5rem;
}
.multiselect-tools-summary {
font-size: 90%;
font-weight: 600;
}
.multiselect-tools-hint {
margin-top: 0.25rem;
font-size: 85%;
opacity: 0.85;
}
.multiselect-tools-list {
display: flex;
flex-direction: column;
gap: 0.5rem;
margin-top: 0.75rem;
}
.multiselect-tool-entry {
padding: 0.5rem;
border-radius: 0.45rem;
border: 1px solid var(--light-border);
background-color: color-mix(in srgb, var(--background-panel) 88%, transparent);
}
.multiselect-tool-button {
width: 100%;
text-align: left;
}
.multiselect-tool-button.multiselect-tool-button-disabled {
opacity: 0.65;
}
.multiselect-tool-note {
margin-top: 0.35rem;
font-size: 80%;
white-space: normal;
}
.image-block-multiselect-checkbox {
display: none;
position: absolute;
top: 0.35rem;
right: 0.35rem;
width: 1.15rem;
height: 1.15rem;
align-items: center;
justify-content: center;
border-radius: 0.2rem;
border: 1px solid var(--light-border);
background-color: color-mix(in srgb, var(--background) 82%, transparent);
box-shadow: 0 0 0.35rem color-mix(in srgb, black 25%, transparent);
z-index: 2;
}
.current-image-batch-multiselect-active .image-block .image-block-multiselect-checkbox {
display: flex;
}
.image-block.image-block-multiselect-selected {
outline: 3px solid var(--box-selected-border-stronger);
}
.image-block.image-block-multiselect-selected .image-block-multiselect-checkbox {
border-color: var(--box-selected-border-stronger);
background-color: var(--box-selected-border-stronger);
color: var(--background);
}
.image-block.image-block-multiselect-selected .image-block-multiselect-checkbox::before {
content: '\2713';
font-size: 0.9rem;
font-weight: 700;
line-height: 1;
}
.image-compare-modal-inner {
width: 95vw;
margin: auto;
min-width: 70vw;
background-color: transparent;
height: 100vh;
display: flex;
flex-direction: column;
}
.image-compare-modal-imagewrap {
flex: 1 1 auto;
min-height: 0;
height: auto;
background-color: transparent;
}
.image-compare-undertext {
min-height: 3rem;
height: auto;
overflow-x: hidden;
overflow-y: auto;
display: flex;
align-items: center;
justify-content: center;
flex: 0 0 auto;
padding: 0.5rem 0.75rem 0.75rem 0.75rem;
}
.image-compare-controls {
display: flex;
justify-content: center;
align-items: center;
flex-wrap: wrap;
gap: 0.5rem;
}
.image-compare-mode-buttons {
display: flex;
justify-content: center;
align-items: center;
flex-wrap: wrap;
gap: 0.5rem;
}
.image-compare-mode-button-active {
background-color: var(--button-background-hover);
color: var(--button-foreground-hover);
border-color: var(--emphasis);
}
.image-compare-stage {
width: 100%;
height: 100%;
min-height: 0;
overflow: hidden;
padding: 0;
background-color: transparent;
}
.image-compare-stage-side {
display: grid;
grid-template-columns: 1fr 1fr;
grid-template-rows: 1fr;
gap: 0;
}
.image-compare-stage-single {
display: block;
}
.image-compare-stage-side .image-compare-slot,
.image-compare-stage-overlay .image-compare-slot,
.image-compare-stage-single .image-compare-slot {
width: 100%;
height: 100%;
}
.image-compare-slot {
position: relative;
min-width: 0;
min-height: 0;
overflow: hidden;
border: none;
border-radius: 0;
background-color: transparent;
display: block;
text-align: left;
cursor: grab;
}
.image-compare-media {
width: auto;
height: auto;
max-width: 100%;
max-height: 100%;
object-fit: contain;
background-color: transparent;
display: block;
}
.image-compare-stage-overlay {
display: flex;
}
.image-compare-overlay {
position: relative;
width: 100%;
height: 100%;
overflow: hidden;
--image-compare-split: 50%;
cursor: grab;
}
.image-compare-overlay-layer {
position: absolute;
inset: 0;
overflow: hidden;
pointer-events: none;
display: block;
text-align: left;
}
.image-compare-overlay-layer-left {
clip-path: inset(0 calc(100% - var(--image-compare-split)) 0 0);
}
.image-compare-overlay-layer-right {
clip-path: inset(0 0 0 var(--image-compare-split));
}
.image-compare-overlay-slide-vertical .image-compare-overlay-layer-left {
clip-path: inset(0 0 calc(100% - var(--image-compare-split)) 0);
}
.image-compare-overlay-slide-vertical .image-compare-overlay-layer-right {
clip-path: inset(var(--image-compare-split) 0 0 0);
}
.image-compare-overlay-transparency .image-compare-overlay-layer-left,
.image-compare-overlay-transparency .image-compare-overlay-layer-right {
clip-path: none;
}
.image-compare-overlay-transparency .image-compare-overlay-layer-right {
opacity: 0.5;
}
.image-compare-overlay-divider {
position: absolute;
top: 0;
bottom: 0;
left: var(--image-compare-split);
width: 1.5rem;
transform: translateX(-50%);
background-color: transparent;
pointer-events: auto;
cursor: ew-resize;
z-index: 2;
}
.image-compare-overlay-slide-vertical .image-compare-overlay-divider {
top: var(--image-compare-split);
bottom: auto;
left: 0;
right: 0;
width: 100%;
height: 1.5rem;
transform: translateY(-50%);
cursor: ns-resize;
}
.image-compare-overlay-divider::before {
content: '';
position: absolute;
top: 0;
bottom: 0;
left: calc(50% - 1px);
width: 2px;
background-color: var(--emphasis);
box-shadow: 0 0 0.75rem var(--emphasis);
}
.image-compare-overlay-slide-vertical .image-compare-overlay-divider::before {
top: calc(50% - 1px);
bottom: auto;
left: 0;
right: 0;
width: auto;
height: 2px;
}
.image-compare-overlay-divider::after {
content: '';
position: absolute;
top: 50%;
left: 50%;
width: 1rem;
height: 1rem;
border-radius: 1rem;
transform: translate(-50%, -50%);
background-color: var(--emphasis);
pointer-events: none;
}
.image-compare-overlay-transparency .image-compare-overlay-divider {
display: none;
}
@media (max-width: 900px) {
.image-compare-stage-side {
grid-template-columns: 1fr;
grid-template-rows: 1fr 1fr;
}
}
.browser-folder-tree-container {
width: 15rem;
display: inline-block;
Expand Down
Loading
Loading