Skip to content

Commit

Permalink
Merge pull request #2563 from alicevision/fix/minorUiFixes
Browse files Browse the repository at this point in the history
[ui] Various minor UI fixes
  • Loading branch information
fabiencastan authored Oct 16, 2024
2 parents 1fbdafe + 12249de commit 9d6fdf1
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 20 deletions.
1 change: 1 addition & 0 deletions meshroom/nodes/aliceVision/Publish.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class Publish(desc.Node):
name="inputFiles",
label="Input Files",
description="Input files or folders' content to publish.",
exposed=True,
group="",
),
desc.File(
Expand Down
3 changes: 2 additions & 1 deletion meshroom/ui/qml/GraphEditor/AttributePin.qml
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ RowLayout {
anchors.fill: parent
anchors.margins: 2
color: {
if ((!object.hasOutputConnections && object.enabled) && outputConnectMA.containsMouse || outputConnectMA.drag.active || (outputDropArea.containsDrag && outputDropArea.acceptableDrop))
if (object.enabled && (outputConnectMA.containsMouse || outputConnectMA.drag.active ||
(outputDropArea.containsDrag && outputDropArea.acceptableDrop)))
return Colors.sysPalette.highlight
return Colors.sysPalette.text
}
Expand Down
16 changes: 0 additions & 16 deletions meshroom/ui/qml/GraphEditor/GraphEditor.qml
Original file line number Diff line number Diff line change
Expand Up @@ -521,22 +521,6 @@ Item {
}
}
}
onVisibleChanged: {
if (visible) {
// Enable the pins on both sides
src.updatePin(true, true) // isSrc = true, isVisible = true
dst.updatePin(false, true) // isSrc = false, isVisible = true
} else {
// One of the attributes is visible, we do not need to handle the case where both attributes are hidden
if (isValidEdge && (src.visible || dst.visible)) {
if (src.visible) {
src.updatePin(true, false) // isSrc = true, isVisible = false
} else {
dst.updatePin(false, false) // isSrc = false, isVisible = false
}
}
}
}

Component.onDestruction: {
// Handles the case where the edge is destroyed while hidden because it is replaced: the pins should be re-enabled
Expand Down
2 changes: 1 addition & 1 deletion meshroom/ui/qml/Homepage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Page {

Item {

SplitView.minimumWidth: 100
SplitView.minimumWidth: 250
SplitView.preferredWidth: 330
SplitView.maximumWidth: 500

Expand Down
4 changes: 2 additions & 2 deletions meshroom/ui/qml/Viewer/SequencePlayer.qml
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ FloatingPane {
verticalAlignment: Text.AlignVCenter
text: {
// number of cached frames is the difference between the first and last frame of all intervals in the cache
let cachedFrames = viewer.cachedFrames
let cachedFrames = viewer ? viewer.cachedFrames : []
let cachedFramesCount = 0
for (let i = 0; i < cachedFrames.length; i++) {
cachedFramesCount += cachedFrames[i].y - cachedFrames[i].x + 1
Expand Down Expand Up @@ -420,7 +420,7 @@ FloatingPane {
ProgressBar {
id: occupiedCacheProgressBar

property string occupiedCache: viewer.ramInfo ? Format.GB2SizeStr(viewer.ramInfo.y) : 0
property string occupiedCache: viewer && viewer.ramInfo ? Format.GB2SizeStr(viewer.ramInfo.y) : 0

width: parent.width

Expand Down

0 comments on commit 9d6fdf1

Please sign in to comment.