Skip to content
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

Jump to bottom

[ui] Various minor UI fixes #2563

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

[ui] Various minor UI fixes #2563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5ff8b5c
[nodes] `Publish`: Exposed the input list of files
cbentejac Oct 3, 2024
56eebcb
[ui] Application: Fill window horizontally
cbentejac Oct 3, 2024
9b72d66
[ui] Homepage: Adjust the minimum width to correctly fit logos
cbentejac Oct 3, 2024
4d2aa79
[GraphEditor] AttributePin: Fix condition for the highlight pin display
cbentejac Oct 3, 2024
e5189fb
[Viewer] SequencePlayer: Prevent null accesses
cbentejac Oct 4, 2024
dcece1d
[GraphEditor] Stop manually editing pins based on the edge's visibility
cbentejac Oct 4, 2024
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 meshroom/nodes/aliceVision/Publish.py
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion meshroom/ui/qml/Application.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,7 @@ Page {
MSplitView {
id: topBottomSplit
Layout.fillHeight: true
width: parent.width
Layout.fillWidth: true

orientation: Qt.Vertical

Expand Down
3 changes: 2 additions & 1 deletion meshroom/ui/qml/GraphEditor/AttributePin.qml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading