Skip to content

unify(controlbar): Merge and move ControlBar and related code to core #2675

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

Open
DevGeniusCode wants to merge 2 commits into
base: main
Choose a base branch
from
Open

unify(controlbar): Merge and move ControlBar and related code to core #2675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74d88e8
unify(controlbar): Merge ControlBar and related code from Zero Hour (…
DevGeniusCode May 2, 2026
b6b1545
unify(controlbar): Move ControlBar files to Core (#2675)
DevGeniusCode May 2, 2026
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
34 changes: 17 additions & 17 deletions Core/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@ set(GAMEENGINE_SRC
Include/GameClient/ClientRandomValue.h
Include/GameClient/Color.h
# Include/GameClient/CommandXlat.h
# Include/GameClient/ControlBar.h
# Include/GameClient/ControlBarResizer.h
# Include/GameClient/ControlBarScheme.h
Include/GameClient/ControlBar.h
Include/GameClient/ControlBarResizer.h
Include/GameClient/ControlBarScheme.h
Include/GameClient/Credits.h
Include/GameClient/DebugDisplay.h
# Include/GameClient/Diplomacy.h
Expand Down Expand Up @@ -711,18 +711,18 @@ set(GAMEENGINE_SRC
Source/GameClient/GraphDraw.cpp
# Source/GameClient/GUI/AnimateWindowManager.cpp
Source/GameClient/GUI/ChallengeGenerals.cpp
# Source/GameClient/GUI/ControlBar/ControlBar.cpp
# Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp
# Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp
# Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp
# Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp
# Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
# Source/GameClient/GUI/ControlBar/ControlBarOCLTimer.cpp
# Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp
# Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp
# Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp
# Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp
# Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp
Source/GameClient/GUI/ControlBar/ControlBar.cpp
Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp
Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp
Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp
Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp
Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
Source/GameClient/GUI/ControlBar/ControlBarOCLTimer.cpp
Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp
Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp
Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp
Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp
Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp
# Source/GameClient/GUI/DisconnectMenu/DisconnectMenu.cpp
# Source/GameClient/GUI/EstablishConnectionsMenu/EstablishConnectionsMenu.cpp
Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp
Expand All @@ -743,8 +743,8 @@ set(GAMEENGINE_SRC
# Source/GameClient/GUI/GameWindowManagerScript.cpp
Source/GameClient/GUI/GameWindowTransitions.cpp
# Source/GameClient/GUI/GameWindowTransitionsStyles.cpp
# Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp
# Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp
Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp
Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp
# Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp
# Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp
# Source/GameClient/GUI/GUICallbacks/GeneralsExpPoints.cpp
Expand Down
0 ...ameEngine/Include/GameClient/ControlBar.h → ...ameEngine/Include/GameClient/ControlBar.h
View file
Open in desktop
File renamed without changes.
0 ...ne/Include/GameClient/ControlBarResizer.h → ...ne/Include/GameClient/ControlBarResizer.h
View file
Open in desktop
File renamed without changes.
0 ...ine/Include/GameClient/ControlBarScheme.h → ...ine/Include/GameClient/ControlBarScheme.h
View file
Open in desktop
File renamed without changes.
11 changes: 11 additions & 0 deletions .../GameClient/GUI/ControlBar/ControlBar.cpp → .../GameClient/GUI/ControlBar/ControlBar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3561,10 +3561,16 @@ void ControlBar::updateSpecialPowerShortcut()
|| !ThePlayerList || !ThePlayerList->getLocalPlayer())
return;

#if RTS_GENERALS
// Base Generals just needs a Command Center to show the shortcut bar
Bool hasValidShortcutButton = (ThePlayerList->getLocalPlayer()->findNaturalCommandCenter() != nullptr);
Copy link
Copy Markdown

@xezon xezon May 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I missed this. I have prepared a fix with #2680

Copy link
Copy Markdown

@xezon xezon May 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs rebase

#else
// Zero Hour looks for explicitly flagged shortcut powers or shortcut selection buttons
Bool hasShortcutSelectionButtons = hasAnyShortcutSelection();
Bool hasAnyShortcutSpecialPower = ThePlayerList->getLocalPlayer()->hasAnyShortcutSpecialPower();

Bool hasValidShortcutButton = hasShortcutSelectionButtons || hasAnyShortcutSpecialPower;
#endif

if( hasValidShortcutButton
&& m_specialPowerShortcutParent->winIsHidden()
Expand Down Expand Up @@ -3776,8 +3782,13 @@ void ControlBar::showSpecialPowerShortcut()
break;
}
}
#if RTS_GENERALS
if(dontAnimate || !ThePlayerList->getLocalPlayer()->findNaturalCommandCenter())
return;
#else
if( dontAnimate || (!ThePlayerList->getLocalPlayer()->hasAnyShortcutSpecialPower() && !hasAnyShortcutSelection()) )
return;
#endif
m_specialPowerShortcutParent->winHide(FALSE);
populateSpecialPowerShortcut(ThePlayerList->getLocalPlayer());

Expand Down
0 ...lient/GUI/ControlBar/ControlBarBeacon.cpp → ...lient/GUI/ControlBar/ControlBarBeacon.cpp
View file
Open in desktop
File renamed without changes.
0 ...ient/GUI/ControlBar/ControlBarCommand.cpp → ...ient/GUI/ControlBar/ControlBarCommand.cpp
View file
Open in desktop
File renamed without changes.
0 ...ontrolBar/ControlBarCommandProcessing.cpp → ...ontrolBar/ControlBarCommandProcessing.cpp
View file
Open in desktop
File renamed without changes.
0 .../GUI/ControlBar/ControlBarMultiSelect.cpp → .../GUI/ControlBar/ControlBarMultiSelect.cpp
View file
Open in desktop
File renamed without changes.
0 ...ent/GUI/ControlBar/ControlBarOCLTimer.cpp → ...ent/GUI/ControlBar/ControlBarOCLTimer.cpp
View file
Open in desktop
File renamed without changes.
0 ...ent/GUI/ControlBar/ControlBarObserver.cpp → ...ent/GUI/ControlBar/ControlBarObserver.cpp
View file
Open in desktop
File renamed without changes.
0 ...I/ControlBar/ControlBarPrintPositions.cpp → ...I/ControlBar/ControlBarPrintPositions.cpp
View file
Open in desktop
File renamed without changes.
0 ...ient/GUI/ControlBar/ControlBarResizer.cpp → ...ient/GUI/ControlBar/ControlBarResizer.cpp
View file
Open in desktop
File renamed without changes.
0 ...lient/GUI/ControlBar/ControlBarScheme.cpp → ...lient/GUI/ControlBar/ControlBarScheme.cpp
View file
Open in desktop
File renamed without changes.
0 ...ntrolBar/ControlBarStructureInventory.cpp → ...ntrolBar/ControlBarStructureInventory.cpp
View file
Open in desktop
File renamed without changes.
0 ...ontrolBar/ControlBarUnderConstruction.cpp → ...ontrolBar/ControlBarUnderConstruction.cpp
View file
Open in desktop
File renamed without changes.
0 ...t/GUI/GUICallbacks/ControlBarCallback.cpp → ...t/GUI/GUICallbacks/ControlBarCallback.cpp
View file
Open in desktop
File renamed without changes.
0 ...ICallbacks/ControlBarPopupDescription.cpp → ...ICallbacks/ControlBarPopupDescription.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Core/GameEngineDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ set(GAMEENGINEDEVICE_SRC
Source/W3DDevice/GameClient/GUI/Gadget/W3DTabControl.cpp
Source/W3DDevice/GameClient/GUI/Gadget/W3DTextEntry.cpp
Source/W3DDevice/GameClient/GUI/Gadget/W3DVerticalSlider.cpp
# Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp
Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp
# Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp
# Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp
# Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp
Expand Down
0 ...Client/GUI/GUICallbacks/W3DControlBar.cpp → ...Client/GUI/GUICallbacks/W3DControlBar.cpp
View file
Open in desktop
File renamed without changes.
34 changes: 17 additions & 17 deletions Generals/Code/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@ set(GAMEENGINE_SRC
# Include/GameClient/ClientRandomValue.h
# Include/GameClient/Color.h
Include/GameClient/CommandXlat.h
Include/GameClient/ControlBar.h
Include/GameClient/ControlBarResizer.h
Include/GameClient/ControlBarScheme.h
# Include/GameClient/ControlBar.h
# Include/GameClient/ControlBarResizer.h
# Include/GameClient/ControlBarScheme.h
# Include/GameClient/Credits.h
# Include/GameClient/DebugDisplay.h
Include/GameClient/Diplomacy.h
Expand Down Expand Up @@ -655,18 +655,18 @@ set(GAMEENGINE_SRC
# Source/GameClient/GraphDraw.cpp
Source/GameClient/GUI/AnimateWindowManager.cpp
# Source/GameClient/GUI/ChallengeGenerals.cpp
Source/GameClient/GUI/ControlBar/ControlBar.cpp
Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp
Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp
Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp
Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp
Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
Source/GameClient/GUI/ControlBar/ControlBarOCLTimer.cpp
Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp
Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp
Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp
Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp
Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp
# Source/GameClient/GUI/ControlBar/ControlBar.cpp
# Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp
# Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp
# Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp
# Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp
# Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
# Source/GameClient/GUI/ControlBar/ControlBarOCLTimer.cpp
# Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp
# Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp
# Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp
# Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp
# Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp
Source/GameClient/GUI/DisconnectMenu/DisconnectMenu.cpp
Source/GameClient/GUI/EstablishConnectionsMenu/EstablishConnectionsMenu.cpp
# Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp
Expand All @@ -687,8 +687,8 @@ set(GAMEENGINE_SRC
Source/GameClient/GUI/GameWindowManagerScript.cpp
# Source/GameClient/GUI/GameWindowTransitions.cpp
Source/GameClient/GUI/GameWindowTransitionsStyles.cpp
Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp
Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp
# Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp
# Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp
Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp
Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp
Source/GameClient/GUI/GUICallbacks/GeneralsExpPoints.cpp
Expand Down
Loading
Loading