3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-08-06 10:18:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

[Panorama Viewer] Disable color picker inside HdrToolbar for Panorama

Browse source 
We cannot retrieve mouse coordinates of images inside the panorama due to a conflict between mouse areas.
This commit is contained in:
Thomas Zorroche 2021-06-15 10:00:09 +02:00 • committed by Fabien Castan
parent 6534fc1191
commit 4a7912c0ff
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
meshroom/ui/qml/Viewer/HdrImageToolbar.qml
View file

@ -24,6 +24,8 @@ FloatingPane {
property string channelModeValue: channelsCtrl.value property string channelModeValue: channelsCtrl.value
property variant colorRGBA: null property variant colorRGBA: null
property bool colorPickerVisible: true
background: Rectangle { color: root.palette.window } background: Rectangle { color: root.palette.window }
DoubleValidator { DoubleValidator {
@ -132,6 +134,7 @@ FloatingPane {
} }
Rectangle { Rectangle {
visible: colorPickerVisible
Layout.preferredWidth: 20 Layout.preferredWidth: 20
implicitWidth: 20 implicitWidth: 20
implicitHeight: parent.height implicitHeight: parent.height
@ -141,6 +144,7 @@ FloatingPane {
// RGBA colors // RGBA colors
RowLayout { RowLayout {
spacing: 1 spacing: 1
visible: colorPickerVisible
TextField { TextField {
id: red id: red
property real value: root.colorRGBA ? root.colorRGBA.x : 0.0 property real value: root.colorRGBA ? root.colorRGBA.x : 0.0

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

@ -191,6 +191,10 @@ FocusScope {
onVisibleChanged: { onVisibleChanged: {
resetDefaultValues(); resetDefaultValues();
} }
colorPickerVisible: {
return !displayPanoramaViewer.checked
}
colorRGBA: { colorRGBA: {
if(!floatImageViewerLoader.item || if(!floatImageViewerLoader.item ||
floatImageViewerLoader.item.status !== Image.Ready) floatImageViewerLoader.item.status !== Image.Ready)