1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement multicolumn popupbox

Browse Source 
Mainly aimed for strategic movement popup box to accommodate increased team sizes
This commit is contained in:
Asdow
2025-04-13 19:11:45 +03:00
parent da3c3bace8
commit 865288e622
3 changed files with 1246 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/PopUpBox.cpp
+803 -417
View File
File diff suppressed because it is too large Load Diff
Utils/PopUpBox.h
+20 -4
View File
@@ -9,6 +9,7 @@
#define MAX_POPUP_BOX_COUNT 32
#define MAX_POPUP_BOX_STRING_COUNT 128 // worst case = 45: move menu with 20 soldiers, each on different squad + overhead
#define MAX_POPUP_BOX_COLUMNS 4
// PopUpBox Flags
#define POPUP_BOX_FLAG_CLIP_TEXT 1
@@ -51,7 +52,8 @@ struct popupbox{
BOOLEAN fUpdated;
BOOLEAN fShowBox;
POPUPSTRINGPTR Text[ MAX_POPUP_BOX_STRING_COUNT ];
POPUPSTRINGPTR Text[MAX_POPUP_BOX_COLUMNS][ MAX_POPUP_BOX_STRING_COUNT ];
// TODO Remove pSecondColumnString
POPUPSTRINGPTR pSecondColumnString[ MAX_POPUP_BOX_STRING_COUNT ];
};
@@ -76,6 +78,8 @@ void SetBoxPosition(INT32 hBoxHandle,SGPPoint Position);
void GetBoxPosition( INT32 hBoxHandle, SGPPoint *Position );
UINT32 GetNumberOfLinesOfTextInBox( INT32 hBoxHandle );
UINT32 GetNumberOfSecondaryLinesOfTextInBox(INT32 hBoxHandle);
UINT32 GetTotalNumberOfLinesOfTextInBox( INT32 hBoxHandle );
UINT32 GetBoxSecondColumnCurrentOffset( INT32 hBoxHandle );
void SetBoxSize( INT32 hBoxHandle, SGPRect Dimensions );
void GetBoxSize( INT32 hBoxHandle, SGPRect *Dimensions );
void SetBoxFlags( INT32 hBoxHandle, UINT32 uiFlags);
@@ -96,8 +100,10 @@ void SetBoxHighLight(INT32 hBoxHandle, UINT8 ubColor);
void SetBoxShade(INT32 hBoxHandle, UINT8 ubColor);
void ShadeStringInBox( INT32 hBoxHandle, INT32 iLineNumber );
void UnShadeStringInBox( INT32 hBoxHandle, INT32 iLineNumber );
void HighLightLine(INT32 hStringHandle);
void HighLightBoxLine( INT32 hBoxHandle, INT32 iLineNumber );
void HighLightLine( INT32 hStringHandle, UINT8 column );
void HighLight2ndLine( INT32 hStringHandle );
void HighLightBoxLine( INT32 hBoxHandle, INT32 iLineNumber, UINT8 column = 0 );
void HighLight2ndBoxLine( INT32 hBoxHandle, INT32 iLineNumber );
void UnHighLightLine(INT32 hStringHandle);
void UnHighLightBox(INT32 hBoxHandle);
void RemoveOneCurrentBoxString(INT32 hStringHandle, BOOLEAN fFillGaps);
@@ -110,6 +116,9 @@ void DisplayOnePopupBox( UINT32 uiIndex, UINT32 uiBuffer );
void SetCurrentBox(INT32 hBoxHandle);
void GetCurrentBox(INT32 *hBoxHandle);
void AddStringToBoxColumn( UINT32 *hStringHandle, STR16 pString, UINT8 column );
void AddColumnMonoString( UINT32 *hStringHandle, STR16 pString, UINT8 column );
// resize this box to the text it contains
void ResizeBoxToText(INT32 hBoxHandle);
@@ -162,6 +171,13 @@ void SetBoxSecondColumnShade(INT32 hBoxHandle, UINT8 ubColor);
// Manual adjustment for 2nd column offset, eg. when 1st column has a title text that's wider than the rest and you want to move 2nd column texts towards the 1st column some.
void SetBoxSecondColumnOffsetAdjustment(INT32 hBoxHandle, INT16 x);
// Set attributes by column
void SetBoxColumnForeground( INT32 hBoxHandle, UINT8 ubColor, UINT8 column );
void SetBoxColumnBackground( INT32 hBoxHandle, UINT8 ubColor, UINT8 column );
void SetBoxColumnHighLight( INT32 hBoxHandle, UINT8 ubColor, UINT8 column );
void SetBoxColumnShade( INT32 hBoxHandle, UINT8 ubColor, UINT8 column );
void SetBoxColumnFont( INT32 hBoxHandle, UINT32 uiFont, UINT8 column );
// secondary shades for boxes
void UnSecondaryShadeStringInBox( INT32 hBoxHandle, INT32 iLineNumber );
@@ -172,4 +188,4 @@ void SetBoxSecondaryShade( INT32 iBox, UINT8 ubColor );
// min width for box
void SpecifyBoxMinWidth( INT32 hBoxHandle, INT32 iMinWidth );
#endif
#endif