Update clear buttons just before showing the dropdown

Signed-off-by: Éloïse Brosseau <eloise.brosseau@autodesk.com>

Author: eloisebrosseau

src/plugins/rv-packages/annotate/annotate_mode.mu

@@ -2260,13 +2260,6 @@ class: AnnotateMinorMode : MinorMode
         return if _syncAutoStart then CheckedMenuState else UncheckedMenuState;
     }
 
-    method: undoSlot (void; bool checked)
-    {
-        undoPaint();
-        updateFrameDependentState();
-        redraw();
-    }
-
     method: clearSlot (void; bool checked)
     {
         clearPaint(_currentNode, _currentNodeInfo.frame);
@@ -2292,6 +2285,13 @@ class: AnnotateMinorMode : MinorMode
         redraw();
     }
 
+    method: undoSlot (void; bool checked)
+    {
+        undoPaint();
+        updateFrameDependentState();
+        redraw();
+    }
+
     method: redoSlot (void; bool checked)
     {
         redoPaint();
@@ -3129,6 +3129,8 @@ class: AnnotateMinorMode : MinorMode
         _clearButton.setMenu(clearMenu);
         _clearButton.setPopupMode(QToolButton.InstantPopup);
 
+        connect(clearMenu, QMenu.aboutToShow, undoRedoClearUpdate);
+
         connect(_clearFrameAct, QAction.triggered, clearSlot);
         connect(_clearAllFramesAct, QAction.triggered, clearAllSlot);
         _clearButton.setStyleSheet("QToolButton::menu-indicator { subcontrol-position: bottom right; top: -2px; }");