Skip to content

fix(gui): Avoid allocating push button data for headless windows #3480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 1 commit into from
Oct 26, 2026
Merged

fix(gui): Avoid allocating push button data for headless windows #3480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Core/GameEngine/Include/GameClient/GameWindowManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ friend class GameWindow;
virtual void reset() override; ///< reset the system
virtual void update() override; ///< update method, called once per frame

virtual Bool isDummy() const { return false; }

virtual GameWindow *allocateNewWindow() = 0; ///< new game window

void linkWindow( GameWindow *window ); ///< link into master list
Expand Down Expand Up @@ -383,6 +385,8 @@ extern WindowMsgHandledType PassMessagesToParentSystem( GameWindow *window,
class GameWindowManagerDummy : public GameWindowManager
{
public:
virtual Bool isDummy() const override { return true; }

virtual GameWindow *winGetWindowFromId(GameWindow *window, Int id) override;
virtual GameWindow *winCreateFromScript(AsciiString filenameString, WindowLayoutInfo *info) override;

Expand Down
67 changes: 37 additions & 30 deletions Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetPushButton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,9 @@ void GadgetButtonSetText( GameWindow *g, UnicodeString text )

PushButtonData * getNewPushButtonData()
{
if( TheWindowManager->isDummy() )
return nullptr;

PushButtonData *p = NEW PushButtonData;
if(!p)
return nullptr;
Expand All @@ -604,6 +607,20 @@ PushButtonData * getNewPushButtonData()
return p;
}

static PushButtonData *getOrCreatePushButtonData( GameWindow *g )
{
PushButtonData *pData = (PushButtonData *)g->winGetUserData();
if( pData == nullptr )
{
pData = getNewPushButtonData();
if( pData == nullptr )
return nullptr;

g->winSetUserData( pData );
}
return pData;
}

// GadgetButtonSetBorder ======================================================
/** Set to draw the special borders in the game */
//=============================================================================
Expand All @@ -612,14 +629,12 @@ void GadgetButtonSetBorder( GameWindow *g, Color color, Bool drawBorder = TRUE )
if( g == nullptr )
return;

PushButtonData *pData = (PushButtonData *)g->winGetUserData();
if(!pData)
{
pData = getNewPushButtonData();
}
PushButtonData *pData = getOrCreatePushButtonData( g );
if( pData == nullptr )
return;

pData->drawBorder = drawBorder;
pData->colorBorder = color;
g->winSetUserData(pData);
}

// GadgetButtonDrawClock ======================================================
Expand All @@ -631,15 +646,13 @@ void GadgetButtonDrawClock( GameWindow *g, Int percent, Color color )
if( g == nullptr )
return;

PushButtonData *pData = (PushButtonData *)g->winGetUserData();
if(!pData)
{
pData = getNewPushButtonData();
}
PushButtonData *pData = getOrCreatePushButtonData( g );
if( pData == nullptr )
return;

pData->drawClock = NORMAL_CLOCK;
pData->percentClock = percent;
pData->colorClock = color;
g->winSetUserData(pData);

}

Expand All @@ -652,15 +665,13 @@ void GadgetButtonDrawInverseClock( GameWindow *g, Int percent, Color color )
if( g == nullptr )
return;

PushButtonData *pData = (PushButtonData *)g->winGetUserData();
if(!pData)
{
pData = getNewPushButtonData();
}
PushButtonData *pData = getOrCreatePushButtonData( g );
if( pData == nullptr )
return;

pData->drawClock = INVERSE_CLOCK;
pData->percentClock = percent;
pData->colorClock = color;
g->winSetUserData(pData);

}

Expand All @@ -669,13 +680,11 @@ void GadgetButtonDrawOverlayImage( GameWindow *g, const Image *image )
if( g == nullptr )
return;

PushButtonData *pData = (PushButtonData *)g->winGetUserData();
if(!pData)
{
pData = getNewPushButtonData();
}
PushButtonData *pData = getOrCreatePushButtonData( g );
if( pData == nullptr )
return;

pData->overlayImage = image;
g->winSetUserData(pData);
}


Expand All @@ -687,13 +696,11 @@ void GadgetButtonSetData(GameWindow *g, void *data)
if( g == nullptr )
return;

PushButtonData *pData = (PushButtonData *)g->winGetUserData();
if(!pData)
{
pData = getNewPushButtonData();
}
PushButtonData *pData = getOrCreatePushButtonData( g );
if( pData == nullptr )
return;

pData->userData = data;
g->winSetUserData(pData);
}

// GadgetButtonGetData ======================================================
Expand Down
Loading