Skip to content

Commit ee7f850

Browse files
authored
Merge pull request #2875 from alicevision/fix/templatesTooltip
[ui] Application: Align menus' tooltips with their entries
2 parents c2f3115 + eda0c7b commit ee7f850

File tree

1 file changed

+65
-18
lines changed

1 file changed

+65
-18
lines changed

meshroom/ui/qml/Application.qml

Lines changed: 65 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -691,6 +691,8 @@ Page {
691691
delay: 200
692692
text: modelData["path"]
693693
visible: hovered
694+
x: newPipelineMenu.implicitWidth
695+
y: newPipelineMenuItems.implicitHeight
694696
}
695697
}
696698
}
@@ -785,8 +787,13 @@ Page {
785787

786788
MenuItem {
787789
action: removeAllImagesAction
788-
ToolTip.visible: hovered
789-
ToolTip.text: removeAllImagesAction.tooltip
790+
791+
ToolTip {
792+
visible: parent.hovered
793+
text: removeAllImagesAction.tooltip
794+
x: parent.implicitWidth
795+
y: 0
796+
}
790797
}
791798

792799
MenuSeparator { }
@@ -811,8 +818,13 @@ Page {
811818

812819
MenuItem {
813820
action: loadTemplateAction
814-
ToolTip.visible: hovered
815-
ToolTip.text: loadTemplateAction.tooltip
821+
822+
ToolTip {
823+
visible: parent.hovered
824+
text: loadTemplateAction.tooltip
825+
x: advancedMenu.implicitWidth
826+
y: 0
827+
}
816828
}
817829

818830
Action {
@@ -831,14 +843,24 @@ Page {
831843

832844
MenuItem {
833845
action: removeImagesFromAllGroupsAction
834-
ToolTip.visible: hovered
835-
ToolTip.text: removeImagesFromAllGroupsAction.tooltip
846+
847+
ToolTip {
848+
visible: parent.hovered
849+
text: removeImagesFromAllGroupsAction.tooltip
850+
x: advancedMenu.implicitWidth
851+
y: 0
852+
}
836853
}
837854

838855
MenuItem {
839856
action: reloadPluginsAction
840-
ToolTip.visible: hovered
841-
ToolTip.text: reloadPluginsAction.tooltip
857+
858+
ToolTip {
859+
visible: parent.hovered
860+
text: reloadPluginsAction.tooltip
861+
x: advancedMenu.implicitWidth
862+
y: 0
863+
}
842864
}
843865
}
844866
MenuSeparator { }
@@ -851,28 +873,53 @@ Page {
851873
title: "Edit"
852874
MenuItem {
853875
action: undoAction
854-
ToolTip.visible: hovered && undoAction.enabled
855-
ToolTip.text: undoAction.tooltip
876+
877+
ToolTip {
878+
visible: parent.hovered && undoAction.enabled
879+
text: undoAction.tooltip
880+
x: parent.implicitWidth
881+
y: 0
882+
}
856883
}
857884
MenuItem {
858885
action: redoAction
859-
ToolTip.visible: hovered && redoAction.enabled
860-
ToolTip.text: redoAction.tooltip
886+
887+
ToolTip {
888+
visible: parent.hovered && redoAction.enabled
889+
text: redoAction.tooltip
890+
x: parent.implicitWidth
891+
y: 0
892+
}
861893
}
862894
MenuItem {
863895
action: cutAction
864-
ToolTip.visible: hovered && cutAction.enabled
865-
ToolTip.text: cutAction.tooltip
896+
897+
ToolTip {
898+
visible: parent.hovered && cutAction.enabled
899+
text: cutAction.tooltip
900+
x: parent.implicitWidth
901+
y: 0
902+
}
866903
}
867904
MenuItem {
868905
action: copyAction
869-
ToolTip.visible: hovered && copyAction.enabled
870-
ToolTip.text: copyAction.tooltip
906+
907+
ToolTip {
908+
visible: parent.hovered && copyAction.enabled
909+
text: copyAction.tooltip
910+
x: parent.implicitWidth
911+
y: 0
912+
}
871913
}
872914
MenuItem {
873915
action: pasteAction
874-
ToolTip.visible: hovered && pasteAction.enabled
875-
ToolTip.text: pasteAction.tooltip
916+
917+
ToolTip {
918+
visible: parent.hovered && pasteAction.enabled
919+
text: pasteAction.tooltip
920+
x: parent.implicitWidth
921+
y: 0
922+
}
876923
}
877924
}
878925
Menu {

0 commit comments

Comments
 (0)