Skip to content

Commit 9d6fdf1

Browse files
authored
Merge pull request #2563 from alicevision/fix/minorUiFixes
[ui] Various minor UI fixes
2 parents 1fbdafe + 12249de commit 9d6fdf1

File tree

5 files changed

+6
-20
lines changed

5 files changed

+6
-20
lines changed

meshroom/nodes/aliceVision/Publish.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class Publish(desc.Node):
2828
name="inputFiles",
2929
label="Input Files",
3030
description="Input files or folders' content to publish.",
31+
exposed=True,
3132
group="",
3233
),
3334
desc.File(

meshroom/ui/qml/GraphEditor/AttributePin.qml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,8 @@ RowLayout {
236236
anchors.fill: parent
237237
anchors.margins: 2
238238
color: {
239-
if ((!object.hasOutputConnections && object.enabled) && outputConnectMA.containsMouse || outputConnectMA.drag.active || (outputDropArea.containsDrag && outputDropArea.acceptableDrop))
239+
if (object.enabled && (outputConnectMA.containsMouse || outputConnectMA.drag.active ||
240+
(outputDropArea.containsDrag && outputDropArea.acceptableDrop)))
240241
return Colors.sysPalette.highlight
241242
return Colors.sysPalette.text
242243
}

meshroom/ui/qml/GraphEditor/GraphEditor.qml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -521,22 +521,6 @@ Item {
521521
}
522522
}
523523
}
524-
onVisibleChanged: {
525-
if (visible) {
526-
// Enable the pins on both sides
527-
src.updatePin(true, true) // isSrc = true, isVisible = true
528-
dst.updatePin(false, true) // isSrc = false, isVisible = true
529-
} else {
530-
// One of the attributes is visible, we do not need to handle the case where both attributes are hidden
531-
if (isValidEdge && (src.visible || dst.visible)) {
532-
if (src.visible) {
533-
src.updatePin(true, false) // isSrc = true, isVisible = false
534-
} else {
535-
dst.updatePin(false, false) // isSrc = false, isVisible = false
536-
}
537-
}
538-
}
539-
}
540524

541525
Component.onDestruction: {
542526
// Handles the case where the edge is destroyed while hidden because it is replaced: the pins should be re-enabled

meshroom/ui/qml/Homepage.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Page {
2222

2323
Item {
2424

25-
SplitView.minimumWidth: 100
25+
SplitView.minimumWidth: 250
2626
SplitView.preferredWidth: 330
2727
SplitView.maximumWidth: 500
2828

meshroom/ui/qml/Viewer/SequencePlayer.qml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ FloatingPane {
385385
verticalAlignment: Text.AlignVCenter
386386
text: {
387387
// number of cached frames is the difference between the first and last frame of all intervals in the cache
388-
let cachedFrames = viewer.cachedFrames
388+
let cachedFrames = viewer ? viewer.cachedFrames : []
389389
let cachedFramesCount = 0
390390
for (let i = 0; i < cachedFrames.length; i++) {
391391
cachedFramesCount += cachedFrames[i].y - cachedFrames[i].x + 1
@@ -420,7 +420,7 @@ FloatingPane {
420420
ProgressBar {
421421
id: occupiedCacheProgressBar
422422

423-
property string occupiedCache: viewer.ramInfo ? Format.GB2SizeStr(viewer.ramInfo.y) : 0
423+
property string occupiedCache: viewer && viewer.ramInfo ? Format.GB2SizeStr(viewer.ramInfo.y) : 0
424424

425425
width: parent.width
426426

0 commit comments

Comments
 (0)