Memory Watches - When repositioning a watch, display it and the help window above most stuff

Author: Zephiles

ttyd-tools/rel/include/global.h

@@ -514,6 +514,7 @@ struct MenuVars
 	uint8_t MenuSelectionStates;
 	int32_t MenuSecondaryValue;
 	uint32_t MemoryWatchSecondaryValue;
+	bool DrawChangingMemoryWatchPosition;
 	uint8_t FrameCounter;
 
 	// Variables used by other stuff

ttyd-tools/rel/source/codes.cpp

@@ -1091,8 +1091,17 @@ void displayStickAngle()
 
 void displayMemoryWatches()
 {
-	// Make sure at least one watch is going to be displayed
+	// Check if a memory watch is currently being repositioned
 	bool tempHideMenu = MenuVar.HideMenu;
+	bool ChangingMemoryWatchPosition = MenuVar.DrawChangingMemoryWatchPosition;
+	
+	if (tempHideMenu && ChangingMemoryWatchPosition)
+	{
+		// A memory watch is being repositioned
+		drawFunctionOnDebugLayerWithOrder(drawMemoryChangeWatchPosition, 10.f);
+	}
+	
+	// Make sure at least one watch is going to be displayed
 	uint32_t tempMenuSelectionOption = MenuVar.MenuSelectedOption;
 	uint32_t Size = sizeof(MemoryWatch) / sizeof(MemoryWatch[0]);
 
@@ -1104,7 +1113,9 @@ void displayMemoryWatches()
 		}
 
 		// Check to see if this watch is currently being repositioned
-		if (tempHideMenu && (tempMenuSelectionOption == i))
+		if (tempHideMenu && 
+			ChangingMemoryWatchPosition && 
+			(tempMenuSelectionOption == i))
 		{
 			// This watch is currently being repositioned, so do not draw it
 		}

ttyd-tools/rel/source/menu.cpp

@@ -1930,6 +1930,7 @@ void menuCheckButton()
 								case CHANGE_WATCH_POSITION:
 								{
 									MenuVar.HideMenu = true;
+									MenuVar.DrawChangingMemoryWatchPosition = true;
 									MemoryWatchPosition.PosX = MemoryWatch[tempMenuSelectedOption].PosX;
 									MemoryWatchPosition.PosY = MemoryWatch[tempMenuSelectedOption].PosY;
 									MenuVar.SelectedOption = CurrentMenuOptionCheck;
@@ -3589,7 +3590,7 @@ void drawMenu()
 				}
 				case CHANGE_WATCH_POSITION:
 				{
-					drawMemoryChangeWatchPosition();
+					// drawMemoryChangeWatchPosition is called in displayMemoryWatches
 					break;
 				}
 				default:

ttyd-tools/rel/source/menufunctions.cpp

@@ -109,10 +109,11 @@ void resetMenu()
 
 void resetMenuToRoot()
 {
-	MenuVar.CurrentMenu 		= ROOT;
-	MenuVar.MenuSelectedOption 	= 0;
-	MenuVar.FunctionReturnCode 	= 0;
-	MenuVar.HideMenu 			= false;
+	MenuVar.CurrentMenu 						= ROOT;
+	MenuVar.MenuSelectedOption 					= 0;
+	MenuVar.FunctionReturnCode 					= 0;
+	MenuVar.HideMenu 							= false;
+	MenuVar.DrawChangingMemoryWatchPosition 	= false;
 	resetMenu();
 
 	MenuVar.CurrentMenuOption = PrevMenuAndOption.PreviousMenuOption[0];
@@ -1787,6 +1788,7 @@ uint32_t memoryChangeWatchPositionButtonControls()
 
 			MenuVar.SelectedOption = 0;
 			MenuVar.HideMenu = false;
+			MenuVar.DrawChangingMemoryWatchPosition = false;
 
 			MenuVar.FrameCounter = 1;
 			return Button;
@@ -1795,6 +1797,7 @@ uint32_t memoryChangeWatchPositionButtonControls()
 		{
 			MenuVar.SelectedOption = 0;
 			MenuVar.HideMenu = false;
+			MenuVar.DrawChangingMemoryWatchPosition = false;
 
 			MenuVar.FrameCounter = 1;
 			return Button;