unify(gadgets): Merge Gadgets and related code from Zero Hour

Author: DevGeniusCode

Generals/Code/GameEngine/Include/GameClient/Gadget.h

@@ -276,8 +276,8 @@ typedef struct _EntryData
 
 	DisplayString *text;						///< the entry text
 	DisplayString *sText;						///< for displaying 'secret' text
-	DisplayString *constructText;		///< for foriegn text construction
-	Bool secretText;								///< If TRUE text appears as astericks
+	DisplayString *constructText;		///< for foreign text construction
+	Bool secretText;								///< If TRUE text appears as asterisks
 	Bool numericalOnly;							///< If TRUE only numbers are allowed as input
 	Bool alphaNumericalOnly;				///< If TRUE only numbers and letters are allowed as input
 	Bool aSCIIOnly;									///< If TRUE ascii allowed as input
@@ -296,7 +296,7 @@ typedef struct _EntryData
 
 	GameWindow *constructList;	// Listbox for construct list.
 	UnsignedShort charPos;			// Position of current character
-	UnsignedShort conCharPos;		// Position of current contruct character
+	UnsignedShort conCharPos;		// Position of current construct character
 
 } EntryData;
 
@@ -306,7 +306,10 @@ typedef struct _TextData
 {
 
 	DisplayString *text;  ///< the text data
-	Bool centered;
+	Bool centered;				///< horizontal
+	Bool centeredVertically;	///< vertical
+	Int leftMargin;					///< left justification margin width
+	Int topMargin;					///< top justification margin width
 
 } TextData;
 
@@ -427,7 +430,7 @@ typedef struct _PushButtonData
 	Color colorBorder;			///< The color for the border around the button
 	void *userData;					///< random additional data we can set
 	const Image *overlayImage; ///< An overlay image (like a veterancy symbol)
-	AsciiString altSound;		///< use an alternitive sound if one is set
+	AsciiString altSound;		///< use an alternative sound if one is set
 } PushButtonData;
 
 // TabControlData ------------------------------------------------------------

Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetPushButton.cpp

@@ -66,6 +66,18 @@
 
 // PRIVATE FUNCTIONS //////////////////////////////////////////////////////////
 
+static Bool buttonTriggersOnMouseDown(GameWindow *window)
+{
+	// Buttons with the on down status set trigger on mouse down. jba. [8/6/2003]
+	Bool onDown = BitIsSet( window->winGetStatus(), WIN_STATUS_ON_MOUSE_DOWN);
+
+	// Checkboxes always trigger on mouse down. jba [8/6/2003]
+	if (BitIsSet( window->winGetStatus(), WIN_STATUS_CHECK_LIKE )) {
+		onDown = true;
+	}
+	return onDown;
+}
+
 // GadgetPushButtonInput ======================================================
 /** Handle input for push button */
 //=============================================================================
@@ -171,8 +183,6 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 				else
 					BitSet( instData->m_state, WIN_STATE_SELECTED );
 
-				TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
-																						(WindowMsgData)window, mData1 );
 
 			}
 			else
@@ -183,6 +193,11 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 
 			}
 
+			if (buttonTriggersOnMouseDown(window)) {
+				TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
+																						(WindowMsgData)window, mData1 );
+			}
+
 			break;
 		}
 
@@ -198,8 +213,11 @@ WindowMsgHandledType GadgetPushButtonInput( GameWindow *window,
 					BitIsSet( window->winGetStatus(), WIN_STATUS_CHECK_LIKE ) == FALSE )
 			{
 
-				TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
-																						(WindowMsgData)window, mData1 );
+				if (!buttonTriggersOnMouseDown(window)) {
+					// If it didn't trigger on mouse down, trigger on the mouse up. jba  [8/6/2003]
+					TheWindowManager->winSendSystemMsg( instData->getOwner(), GBM_SELECTED,
+																							(WindowMsgData)window, mData1 );
+				}
 
 				BitClear( instData->m_state, WIN_STATE_SELECTED );
 

Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp

@@ -1134,6 +1134,13 @@ static Bool parseStaticTextData( const char *token, WinInstanceData *instData,
 	c = strtok( nullptr, seps );  // value
 	scanBool( c, textData->centered );
 
+	// @todo: add these  to GUIEdit options and output
+	// These are initialized here because any TextData constructor would never get called.
+	// The behavior with these defaults is the same as it was before these members were added.
+	textData->centeredVertically = TRUE;
+	textData->leftMargin = 7;
+	textData->topMargin = 7;
+
 	return TRUE;
 
 }

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DPushButton.cpp

@@ -121,8 +121,17 @@ static void drawButtonText( GameWindow *window, WinInstanceData *instData )
 	text->getSize( &width, &height );
 
 	// where to draw
-	textPos.x = origin.x + (size.x / 2) - (width / 2);
-	textPos.y = origin.y + (size.y / 2) - (height / 2);
+	if( BitIsSet( window->winGetStatus(), WIN_STATUS_SHORTCUT_BUTTON ) )
+	{
+		// Oh god... this is a total hack for shortcut buttons to handle rendering text top left corner...
+		textPos.x = origin.x + 2;
+		textPos.y = origin.y + 0;
+	}
+	else
+	{
+		textPos.x = origin.x + (size.x / 2) - (width / 2);
+		textPos.y = origin.y + (size.y / 2) - (height / 2);
+	}
 
 	// draw it
 	text->draw( textPos.x, textPos.y, textColor, dropColor );

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/Gadget/W3DStaticText.cpp

@@ -114,26 +114,29 @@ static void drawStaticTextText( GameWindow *window, WinInstanceData *instData,
 	clipRegion.hi.x = origin.x + size.x ;
 	clipRegion.hi.y = origin.y + size.y;
 
+	// horizontal centering?
 	if( tData->centered )
 	{
-
 		textPos.x = origin.x + (size.x / 2) - (textWidth / 2);
-		textPos.y = origin.y + (size.y / 2) - (textHeight / 2);
-		text->setClipRegion(&clipRegion);
-		text->draw( textPos.x, textPos.y, textColor, textDropColor );
-
 	}
 	else
 	{
+		textPos.x = origin.x + tData->leftMargin;
+	}
 
-		// draw the text
-		textPos.x = origin.x + 7;
+	// vertical centering?
+	if ( tData->centeredVertically )
+	{
 		textPos.y = origin.y + (size.y / 2) - (textHeight / 2);
-		text->setClipRegion(&clipRegion);
-		text->draw( textPos.x, textPos.y, textColor, textDropColor );
-
+	}
+	else
+	{
+		textPos.y = origin.y + tData->topMargin;
 	}
 
+	// draw the text
+	text->setClipRegion(&clipRegion);
+	text->draw( textPos.x, textPos.y, textColor, textDropColor );
 
 }