3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-06-05 04:12:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

[ui] Viewer2D: minor adjustments

Browse source 
* more explicit variable name for hdrImageToolbar
* adjust padding, so the viewer2D.bottomToolbar is aligned with the
ImageGallery toolbar
* update tooltip for HDR image viewer
This commit is contained in:
Fabien Castan 2020-03-04 19:00:31 +01:00
parent d70c625fac
commit 540c0d1744
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
meshroom/ui/qml/Viewer/Viewer2D.qml
View file

@ -101,7 +101,7 @@ FocusScope {
anchors.fill: parent anchors.fill: parent
ImageToolbar { ImageToolbar {
id: imageToolbar id: hdrImageToolbar
anchors.margins: 0 anchors.margins: 0
visible: displayImageToolBarAction.checked && displayImageToolBarAction.enabled visible: displayImageToolBarAction.checked && displayImageToolBarAction.enabled
Layout.fillWidth: true Layout.fillWidth: true
@ -158,9 +158,9 @@ FocusScope {
// floatViewerComp.createObject(floatImageViewerLoader, { // floatViewerComp.createObject(floatImageViewerLoader, {
setSource("FloatImage.qml", { setSource("FloatImage.qml", {
'source': Qt.binding(function() { return getImageFile(imageType.type); }), 'source': Qt.binding(function() { return getImageFile(imageType.type); }),
'gamma': Qt.binding(function() { return imageToolbar.gammaValue; }), 'gamma': Qt.binding(function() { return hdrImageToolbar.gammaValue; }),
'offset': Qt.binding(function() { return imageToolbar.offsetValue; }), 'offset': Qt.binding(function() { return hdrImageToolbar.offsetValue; }),
'channelModeString': Qt.binding(function() { return imageToolbar.channelModeValue; }), 'channelModeString': Qt.binding(function() { return hdrImageToolbar.channelModeValue; }),
}) })
} }
} }
@ -315,6 +315,7 @@ FocusScope {
} }
FloatingPane { FloatingPane {
id: bottomToolbar id: bottomToolbar
padding: 4
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: childrenRect.height Layout.preferredHeight: childrenRect.height
@ -337,7 +338,7 @@ FocusScope {
id: displayHDR id: displayHDR
font.pointSize: 20 font.pointSize: 20
padding: 0 padding: 0
ToolTip.text: "HDR Floating Point Viewer" ToolTip.text: "High-Dynamic-Range Image Viewer"
text: MaterialIcons.hdr_on text: MaterialIcons.hdr_on
checkable: true checkable: true
checked: false checked: false