Skip to content

Allow basic widget ordering of widgets in a subflow #1759

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

Merged
merged 1 commit into from
Jul 25, 2025
Merged

Allow basic widget ordering of widgets in a subflow #1759

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
24 changes: 14 additions & 10 deletions nodes/widgets/ui_audio.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
// change inputs from hidden to text & display them
$('#node-input-width').attr('type', 'text')
$('#node-input-height').attr('type', 'text')
$('div.form-row.nr-db-ui-element-sizer-row').hide()
$('div.form-row.nr-db-ui-manual-size-row').show()
$('div.form-row.nr-db-ui-element-hide-in-subflow').hide()
$('div.form-row.nr-db-ui-element-show-in-subflow').show()
} else {
// not in a subflow, use the elementSizer
$('div.form-row.nr-db-ui-element-sizer-row').show()
$('div.form-row.nr-db-ui-manual-size-row').hide()
$('div.form-row.nr-db-ui-element-hide-in-subflow').show()
$('div.form-row.nr-db-ui-element-show-in-subflow').hide()
$('#node-input-size').elementSizer({
width: '#node-input-width',
height: '#node-input-height',
Expand Down Expand Up @@ -72,18 +72,22 @@
<label for="node-input-group"><i class="fa fa-table"></i> <span data-i18n="ui-audio.label.group"></label>
<input type="text" id="node-input-group">
</div>
<div class="form-row nr-db-ui-element-sizer-row">
<label><i class="fa fa-object-group"></i> <span data-i18n="ui-audio.label.size"></label>
<div class="form-row nr-db-ui-element-hide-in-subflow">
<label><i class="fa fa-object-group"></i> <span data-i18n="ui-base.label.size">Size</label>
<button class="editor-button" id="node-input-size"></button>
</div>
<div class="form-row nr-db-ui-manual-size-row">
<label><i class="fa fa-arrows-h"></i> <span data-i18n="ui-audio.label.width">Width</label>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows-h"></i> <span data-i18n="ui-base.label.width">Width</label>
<input type="hidden" id="node-input-width">
</div>
<div class="form-row nr-db-ui-manual-size-row">
<label><i class="fa fa-arrows-v"></i> <span data-i18n="ui-audio.label.height">Height</label>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows-v"></i> <span data-i18n="ui-base.label.height">Height</label>
<input type="hidden" id="node-input-height">
</div>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows"></i> <span data-i18n="ui-base.label.order">Order</label>
<input type="text" id="node-input-order">
</div>
<div class="form-row">
<label for="node-input-src"><i class="fa fa-globe"></i> <span data-i18n="ui-audio.label.source"></label>
<input type="text" id="node-input-src">
Expand Down
24 changes: 14 additions & 10 deletions nodes/widgets/ui_button.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@
// change inputs from hidden to text & display them
$('#node-input-width').attr('type', 'text')
$('#node-input-height').attr('type', 'text')
$('div.form-row.nr-db-ui-element-sizer-row').hide()
$('div.form-row.nr-db-ui-manual-size-row').show()
$('div.form-row.nr-db-ui-element-hide-in-subflow').hide()
$('div.form-row.nr-db-ui-element-show-in-subflow').show()
} else {
// not in a subflow, use the elementSizer
$('div.form-row.nr-db-ui-element-sizer-row').show()
$('div.form-row.nr-db-ui-manual-size-row').hide()
$('div.form-row.nr-db-ui-element-hide-in-subflow').show()
$('div.form-row.nr-db-ui-element-show-in-subflow').hide()
$('#node-input-size').elementSizer({
width: '#node-input-width',
height: '#node-input-height',
Expand Down Expand Up @@ -158,18 +158,22 @@
<label for="node-input-group"><i class="fa fa-table"></i> <span data-i18n="ui-button.label.group"></label>
<input type="text" id="node-input-group">
</div>
<div class="form-row nr-db-ui-element-sizer-row">
<label><i class="fa fa-object-group"></i> <span data-i18n="ui-button.label.size"></label>
<div class="form-row nr-db-ui-element-hide-in-subflow">
<label><i class="fa fa-object-group"></i> <span data-i18n="ui-base.label.size">Size</label>
<button class="editor-button" id="node-input-size"></button>
</div>
<div class="form-row nr-db-ui-manual-size-row">
<label><i class="fa fa-arrows-h"></i> <span data-i18n="ui-button.label.width">Width</label>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows-h"></i> <span data-i18n="ui-base.label.width">Width</label>
<input type="hidden" id="node-input-width">
</div>
<div class="form-row nr-db-ui-manual-size-row">
<label><i class="fa fa-arrows-v"></i> <span data-i18n="ui-button.label.height">Height</label>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows-v"></i> <span data-i18n="ui-base.label.height">Height</label>
<input type="hidden" id="node-input-height">
</div>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows"></i> <span data-i18n="ui-base.label.order">Order</label>
<input type="text" id="node-input-order">
</div>
<div class="form-row form-row-flex">
<label for="node-input-icon"><i class="fa fa-picture-o"></i> <span data-i18n="ui-button.label.icon"></label>
<div style="display: flex; align-items: center; flex-grow: 1; padding-right: calc(30% - 104px); gap: 12px;">
Expand Down
24 changes: 14 additions & 10 deletions nodes/widgets/ui_button_group.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
// change inputs from hidden to text & display them
$('#node-input-width').attr('type', 'text')
$('#node-input-height').attr('type', 'text')
$('div.form-row.nr-db-ui-element-sizer-row').hide()
$('div.form-row.nr-db-ui-manual-size-row').show()
$('div.form-row.nr-db-ui-element-hide-in-subflow').hide()
$('div.form-row.nr-db-ui-element-show-in-subflow').show()
} else {
// not in a subflow, use the elementSizer
$('div.form-row.nr-db-ui-element-sizer-row').show()
$('div.form-row.nr-db-ui-manual-size-row').hide()
$('div.form-row.nr-db-ui-element-hide-in-subflow').show()
$('div.form-row.nr-db-ui-element-show-in-subflow').hide()
$('#node-input-size').elementSizer({
width: '#node-input-width',
height: '#node-input-height',
Expand Down Expand Up @@ -223,18 +223,22 @@
<label for="node-input-group"><i class="fa fa-table"></i> <span data-i18n="ui-button-group.label.group"></label>
<input type="text" id="node-input-group">
</div>
<div class="form-row nr-db-ui-element-sizer-row">
<label><i class="fa fa-object-group"></i> <span data-i18n="ui-button-group.label.size"></label>
<div class="form-row nr-db-ui-element-hide-in-subflow">
<label><i class="fa fa-object-group"></i> <span data-i18n="ui-base.label.size">Size</label>
<button class="editor-button" id="node-input-size"></button>
</div>
<div class="form-row nr-db-ui-manual-size-row">
<label><i class="fa fa-arrows-h"></i> <span data-i18n="ui-button-group.label.width">Width</label>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows-h"></i> <span data-i18n="ui-base.label.width">Width</label>
<input type="hidden" id="node-input-width">
</div>
<div class="form-row nr-db-ui-manual-size-row">
<label><i class="fa fa-arrows-v"></i> <span data-i18n="ui-button-group.label.height">Height</label>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows-v"></i> <span data-i18n="ui-base.label.height">Height</label>
<input type="hidden" id="node-input-height">
</div>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows"></i> <span data-i18n="ui-base.label.order">Order</label>
<input type="text" id="node-input-order">
</div>
<div class="form-row">
<label for="node-input-label"><i class="fa fa-i-cursor"></i> <span data-i18n="ui-button-group.label.label"></span></label>
<input type="text" id="node-input-label">
Expand Down
24 changes: 14 additions & 10 deletions nodes/widgets/ui_chart.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,12 @@
// change inputs from hidden to text & display them
$('#node-input-width').attr('type', 'text')
$('#node-input-height').attr('type', 'text')
$('div.form-row.nr-db-ui-element-sizer-row').hide()
$('div.form-row.nr-db-ui-manual-size-row').show()
$('div.form-row.nr-db-ui-element-hide-in-subflow').hide()
$('div.form-row.nr-db-ui-element-show-in-subflow').show()
} else {
// not in a subflow, use the elementSizer
$('div.form-row.nr-db-ui-element-sizer-row').show()
$('div.form-row.nr-db-ui-manual-size-row').hide()
$('div.form-row.nr-db-ui-element-hide-in-subflow').show()
$('div.form-row.nr-db-ui-element-show-in-subflow').hide()
$('#node-input-size').elementSizer({
width: '#node-input-width',
height: '#node-input-height',
Expand Down Expand Up @@ -483,18 +483,22 @@
<label for="node-input-group"><i class="fa fa-table"></i> <span data-i18n="ui-chart.label.group"></span></label>
<input type="text" id="node-input-group">
</div>
<div class="form-row nr-db-ui-element-sizer-row">
<label><i class="fa fa-object-group"></i> <span data-i18n="ui-chart-group.label.size"></label>
<div class="form-row nr-db-ui-element-hide-in-subflow">
<label><i class="fa fa-object-group"></i> <span data-i18n="ui-base.label.size">Size</label>
<button class="editor-button" id="node-input-size"></button>
</div>
<div class="form-row nr-db-ui-manual-size-row">
<label><i class="fa fa-arrows-h"></i> <span data-i18n="ui-chart-group.label.width">Width</label>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows-h"></i> <span data-i18n="ui-base.label.width">Width</label>
<input type="hidden" id="node-input-width">
</div>
<div class="form-row nr-db-ui-manual-size-row">
<label><i class="fa fa-arrows-v"></i> <span data-i18n="ui-chart-group.label.height">Height</label>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows-v"></i> <span data-i18n="ui-base.label.height">Height</label>
<input type="hidden" id="node-input-height">
</div>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows"></i> <span data-i18n="ui-base.label.order">Order</label>
<input type="text" id="node-input-order">
</div>
<div class="form-row">
<label for="node-input-label"><i class="fa fa-i-cursor"></i> <span data-i18n="ui-chart.label.label"></span></label>
<input type="text" id="node-input-label" data-i18n="[placeholder]ui-chart.label.optionalChartTitle">
Expand Down
24 changes: 14 additions & 10 deletions nodes/widgets/ui_dropdown.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@
// change inputs from hidden to text & display them
$('#node-input-width').attr('type', 'text')
$('#node-input-height').attr('type', 'text')
$('div.form-row.nr-db-ui-element-sizer-row').hide()
$('div.form-row.nr-db-ui-manual-size-row').show()
$('div.form-row.nr-db-ui-element-hide-in-subflow').hide()
$('div.form-row.nr-db-ui-element-show-in-subflow').show()
} else {
// not in a subflow, use the elementSizer
$('div.form-row.nr-db-ui-element-sizer-row').show()
$('div.form-row.nr-db-ui-manual-size-row').hide()
$('div.form-row.nr-db-ui-element-hide-in-subflow').show()
$('div.form-row.nr-db-ui-element-show-in-subflow').hide()
$('#node-input-size').elementSizer({
width: '#node-input-width',
height: '#node-input-height',
Expand Down Expand Up @@ -181,18 +181,22 @@
<label for="node-input-group"><i class="fa fa-table"></i> <span data-i18n="ui-dropdown.label.group"></span></label>
<input type="text" id="node-input-group">
</div>
<div class="form-row nr-db-ui-element-sizer-row">
<label><i class="fa fa-object-group"></i> <span data-i18n="ui-dropdown.label.size"></span></label>
<div class="form-row nr-db-ui-element-hide-in-subflow">
<label><i class="fa fa-object-group"></i> <span data-i18n="ui-base.label.size">Size</label>
<button class="editor-button" id="node-input-size"></button>
</div>
<div class="form-row nr-db-ui-manual-size-row">
<label><i class="fa fa-arrows-h"></i> <span data-i18n="ui-dropdown.label.width"></span></label>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows-h"></i> <span data-i18n="ui-base.label.width">Width</label>
<input type="hidden" id="node-input-width">
</div>
<div class="form-row nr-db-ui-manual-size-row">
<label><i class="fa fa-arrows-v"></i> <span data-i18n="ui-dropdown.label.height"></span></label>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows-v"></i> <span data-i18n="ui-base.label.height">Height</label>
<input type="hidden" id="node-input-height">
</div>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows"></i> <span data-i18n="ui-base.label.order">Order</label>
<input type="text" id="node-input-order">
</div>
<div class="form-row">
<label for="node-input-label"><i class="fa fa-tag"></i> <span data-i18n="ui-dropdown.label.label"></span></label>
<input type="text" id="node-input-label" data-i18n="[placeholder]ui-dropdown.label.labelPlaceholder">
Expand Down
24 changes: 17 additions & 7 deletions nodes/widgets/ui_file_input.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@
// change inputs from hidden to text & display them
$('#node-input-width').attr('type', 'text')
$('#node-input-height').attr('type', 'text')
$('div.form-row.nr-db-ui-element-sizer-row').hide()
$('div.form-row.nr-db-ui-manual-size-row').show()
$('div.form-row.nr-db-ui-element-hide-in-subflow').hide()
$('div.form-row.nr-db-ui-element-show-in-subflow').show()
} else {
// not in a subflow, use the elementSizer
$('div.form-row.nr-db-ui-element-sizer-row').show()
$('div.form-row.nr-db-ui-manual-size-row').hide()
$('div.form-row.nr-db-ui-element-hide-in-subflow').show()
$('div.form-row.nr-db-ui-element-show-in-subflow').hide()
$('#node-input-size').elementSizer({
width: '#node-input-width',
height: '#node-input-height',
Expand Down Expand Up @@ -82,11 +82,21 @@
<label for="node-input-group"><i class="fa fa-table"></i> <span data-i18n="ui-file-input.label.group"></span></label>
<input type="text" id="node-input-group">
</div>
<div class="form-row">
<label><i class="fa fa-object-group"></i> <span data-i18n="ui-file-input.label.size"></span></label>
<div class="form-row nr-db-ui-element-hide-in-subflow">
<label><i class="fa fa-object-group"></i> <span data-i18n="ui-base.label.size">Size</label>
<button class="editor-button" id="node-input-size"></button>
</div>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows-h"></i> <span data-i18n="ui-base.label.width">Width</label>
<input type="hidden" id="node-input-width">
</div>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows-v"></i> <span data-i18n="ui-base.label.height">Height</label>
<input type="hidden" id="node-input-height">
<button class="editor-button" id="node-input-size"></button>
</div>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows"></i> <span data-i18n="ui-base.label.order">Order</label>
<input type="text" id="node-input-order">
</div>
<div class="form-row">
<label for="node-input-label"><i class="fa fa-i-cursor"></i> <span data-i18n="ui-file-input.label.label"></span></label>
Expand Down
24 changes: 14 additions & 10 deletions nodes/widgets/ui_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@
// change inputs from hidden to text & display them
$('#node-input-width').attr('type', 'text')
$('#node-input-height').attr('type', 'text')
$('div.form-row.nr-db-ui-element-sizer-row').hide()
$('div.form-row.nr-db-ui-manual-size-row').show()
$('div.form-row.nr-db-ui-element-hide-in-subflow').hide()
$('div.form-row.nr-db-ui-element-show-in-subflow').show()
} else {
// not in a subflow, use the elementSizer
$('div.form-row.nr-db-ui-element-sizer-row').show()
$('div.form-row.nr-db-ui-manual-size-row').hide()
$('div.form-row.nr-db-ui-element-hide-in-subflow').show()
$('div.form-row.nr-db-ui-element-show-in-subflow').hide()
$('#node-input-size').elementSizer({
width: '#node-input-width',
height: '#node-input-height',
Expand Down Expand Up @@ -463,18 +463,22 @@
<label for="node-input-group"><i class="fa fa-table"></i> <span data-i18n="ui-form.label.group"></label>
<input type="text" id="node-input-group">
</div>
<div class="form-row nr-db-ui-element-sizer-row">
<label><i class="fa fa-object-group"></i> <span data-i18n="ui-form.label.size"></label>
<div class="form-row nr-db-ui-element-hide-in-subflow">
<label><i class="fa fa-object-group"></i> <span data-i18n="ui-base.label.size">Size</label>
<button class="editor-button" id="node-input-size"></button>
</div>
<div class="form-row nr-db-ui-manual-size-row">
<label><i class="fa fa-arrows-h"></i> <span data-i18n="ui-form.label.width"></label>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows-h"></i> <span data-i18n="ui-base.label.width">Width</label>
<input type="hidden" id="node-input-width">
</div>
<div class="form-row nr-db-ui-manual-size-row">
<label><i class="fa fa-arrows-v"></i> <span data-i18n="ui-form.label.height"></label>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows-v"></i> <span data-i18n="ui-base.label.height">Height</label>
<input type="hidden" id="node-input-height">
</div>
<div class="form-row nr-db-ui-element-show-in-subflow">
<label><i class="fa fa-arrows"></i> <span data-i18n="ui-base.label.order">Order</label>
<input type="text" id="node-input-order">
</div>
<div class="form-row">
<label for="node-input-label"><i class="fa fa-tag"></i> <span data-i18n="ui-form.label.label"></label>
<input type="text" id="node-input-label" data-i18n="[placeholder]ui-form.label.labelPlaceholder">
Expand Down
Loading
Loading