Skip to content

Commit

Permalink
multimenu: Also support Team Strategy view (if applicable)
Browse files Browse the repository at this point in the history
  • Loading branch information
@past-due
past-due committed Oct 21, 2023
1 parent 4574489 commit c1457c7
Show file tree
Hide file tree
Showing 3 changed files with 188 additions and 37 deletions.
16 changes: 5 additions & 11 deletions src/intelmap.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "lib/widget/paragraph.h"
#include "lib/widget/label.h"
#include "lib/widget/scrollablelist.h"
#include "lib/widget/multibutform.h"
#include "lib/sound/mixer.h" //for sound_GetUIVolume()
/* Includes direct access to render library */
#include "lib/ivis_opengl/pieblitfunc.h"
Expand Down Expand Up @@ -415,24 +416,17 @@ void W_INTELLIGENCEOVERLAY_FORM::geometryChanged()

std::shared_ptr<IntFormAnimated> W_INTELLIGENCEOVERLAY_FORM::createMultiMenuForm()
{
auto form = std::make_shared<IntFormAnimated>();
auto form = intCreateMultiMenuForm();
form->id = MULTIMENU_FORM;

auto grid = intCreateMultiMenuWidget();
form->attach(grid);

std::weak_ptr<WIDGET> weakGrid = grid;
form->setCalcLayout([weakGrid](WIDGET *form) {
form->setCalcLayout([](WIDGET *form) {
auto psParent = form->parent();
if (psParent == nullptr)
{
return;
}
auto strongGrid = weakGrid.lock();
ASSERT_OR_RETURN(, strongGrid != nullptr, "No grid");
auto width = std::min((int32_t)psParent->width() - 20, strongGrid->idealWidth());
auto height = strongGrid->idealHeight();
strongGrid->setGeometry(0, 0, width, height);
auto width = std::min((int32_t)psParent->width() - 20, form->idealWidth());
auto height = form->idealHeight();
form->setGeometry((psParent->width() - width) / 2, OVERLAY_MULTIMENU_FORM_Y, width, height);
});

Expand Down
205 changes: 180 additions & 25 deletions src/multimenu.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#include "lib/widget/button.h"
#include "lib/widget/label.h"
#include "lib/widget/widget.h"
#include "lib/widget/multibutform.h"
#include "lib/widget/paneltabbutton.h"

#include "display3d.h"
#include "intdisplay.h"
Expand Down Expand Up @@ -65,6 +67,7 @@
#include "keybind.h"
#include "loop.h"
#include "frontend.h"
#include "hci/teamstrategy.h"

// ////////////////////////////////////////////////////////////////////////////
// defines
Expand All @@ -78,7 +81,7 @@ static UDWORD current_context = 0;
UDWORD current_numplayers = 4;
static std::string current_searchString;

#define MULTIMENU_FORM_Y 23 + D_H
#define MULTIMENU_FORM_Y 25

#define MULTIMENU_CLOSE (MULTIMENU+1)
#define MULTIMENU_PLAYER (MULTIMENU+2)
Expand Down Expand Up @@ -1250,10 +1253,177 @@ class MultiMenuGrid: public GridLayout
std::vector<PlayerWidgets> playersWidgets;
};

std::shared_ptr<WIDGET> intCreateMultiMenuWidget()
class WzMultiMenuTabs : public MultichoiceWidget
{
auto grid = MultiMenuGrid::make();
return grid;
public:
WzMultiMenuTabs(int value = -1) : MultichoiceWidget(value) { }
virtual void display(int xOffset, int yOffset) override { }
};

constexpr int MULTIMENUFORM_INTERNAL_PADDING = 10;
constexpr int MULTIMENUFORM_PANEL_TABS_HEIGHT = 20;

class WzMultiWidget : public IntFormAnimated
{
public:
WzMultiWidget(bool openAnimate = true)
: IntFormAnimated(openAnimate)
{ }
public:
static std::shared_ptr<WzMultiWidget> make(bool openAnimate, std::function<void ()> closeButtonHandler);
protected:
virtual void geometryChanged() override;
virtual int32_t idealWidth() override;
virtual int32_t idealHeight() override;
private:
void initialize(std::function<void ()> closeButtonHandler);
void switchAttachedPanel(const std::shared_ptr<WIDGET> newPanel);
private:
std::shared_ptr<W_BUTTON> closeButton;
std::shared_ptr<WzMultiMenuTabs> panelSwitcher;
std::shared_ptr<MultiMenuGrid> multiMenuGrid;
std::shared_ptr<WIDGET> teamStrategyViewWrapped;
std::vector<std::shared_ptr<WIDGET>> panels;
std::shared_ptr<WIDGET> currentlyAttachedPanel;
};

std::shared_ptr<WzMultiWidget> WzMultiWidget::make(bool openAnimate, std::function<void ()> closeButtonHandler)
{
auto result = std::make_shared<WzMultiWidget>(openAnimate);
result->initialize(closeButtonHandler);
return result;
}

void WzMultiWidget::geometryChanged()
{
if (closeButton)
{
closeButton->callCalcLayout();
}
if (panelSwitcher)
{
panelSwitcher->callCalcLayout();
}
for (auto& panel : panels)
{
int panelY0 = 0;
if (panelSwitcher)
{
panelY0 += panelSwitcher->y() + panelSwitcher->height() + MULTIMENUFORM_INTERNAL_PADDING;
}
int panelHeight = std::min(panel->idealHeight(), height() - panelY0);
panel->setGeometry(0, panelY0, width(), panelHeight);
}
}

int32_t WzMultiWidget::idealWidth()
{
int32_t maxPanelIdealWidth = 0;
for (auto& panel : panels)
{
maxPanelIdealWidth = std::max(maxPanelIdealWidth, panel->idealWidth());
}
return maxPanelIdealWidth;
}

int32_t WzMultiWidget::idealHeight()
{
int32_t result = 0;
if (panelSwitcher)
{
result += MULTIMENUFORM_INTERNAL_PADDING + panelSwitcher->idealHeight() + MULTIMENUFORM_INTERNAL_PADDING;
}
int32_t maxPanelIdealHeight = 0;
for (auto& panel : panels)
{
maxPanelIdealHeight = std::max(maxPanelIdealHeight, panel->idealHeight());
}
result += maxPanelIdealHeight + MULTIMENUFORM_INTERNAL_PADDING;
return result;
}

void WzMultiWidget::switchAttachedPanel(const std::shared_ptr<WIDGET> newPanel)
{
if (currentlyAttachedPanel)
{
detach(currentlyAttachedPanel);
}
currentlyAttachedPanel = newPanel;
attach(newPanel);
}

void WzMultiWidget::initialize(std::function<void ()> closeButtonHandler)
{
if (closeButtonHandler)
{
// Add the close button.
W_BUTINIT sButInit;
sButInit.id = MULTIMENU_CLOSE;
sButInit.pTip = _("Close");
sButInit.pDisplay = intDisplayImageHilight;
sButInit.UserData = PACKDWORD_TRI(0, IMAGE_CLOSEHILIGHT , IMAGE_CLOSE);
closeButton = std::make_shared<W_BUTTON>(&sButInit);
closeButton->addOnClickHandler([closeButtonHandler](W_BUTTON&) {
closeButtonHandler();
});
attach(closeButton);
closeButton->setCalcLayout([](WIDGET *psButton) {
auto psParent = psButton->parent();
ASSERT_OR_RETURN(, psParent != nullptr, "No parent");
psButton->setGeometry(psParent->width() - CLOSE_WIDTH, 0, CLOSE_WIDTH, CLOSE_HEIGHT);
});
}

multiMenuGrid = MultiMenuGrid::make();
panels.push_back(multiMenuGrid);

bool allowAIsForTeamStrategy = !NetPlay.bComms;
if (gameHasTeamStrategyView(allowAIsForTeamStrategy))
{
auto teamStrategyView = createTeamStrategyView(allowAIsForTeamStrategy);
if (teamStrategyView)
{
transformTeamStrategyViewMode(teamStrategyView, true);
teamStrategyViewSetBackgroundColor(teamStrategyView, pal_RGBA(25, 0, 110, 180));
teamStrategyViewWrapped = Margin(0, 10).wrap(teamStrategyView);
panels.push_back(teamStrategyViewWrapped);
}
}

if (teamStrategyViewWrapped)
{
// add tabs
panelSwitcher = std::make_shared<WzMultiMenuTabs>(0);
attach(panelSwitcher);
panelSwitcher->setButtonAlignment(MultibuttonWidget::ButtonAlignment::CENTER_ALIGN);
panelSwitcher->addButton(0, WzPanelTabButton::make(_("Players View")));
panelSwitcher->addButton(1, WzPanelTabButton::make(_("Team Strategy")));
panelSwitcher->choose(0);
panelSwitcher->addOnChooseHandler([](MultibuttonWidget& widget, int newValue){
// Switch actively-displayed panel
auto weakParent = std::weak_ptr<WIDGET>(widget.parent());
widgScheduleTask([newValue, weakParent](){
auto strongParent = std::dynamic_pointer_cast<WzMultiWidget>(weakParent.lock());
ASSERT_OR_RETURN(, strongParent != nullptr, "Parent doesn't exist?");
strongParent->switchAttachedPanel(strongParent->panels[newValue]);
});
});
panelSwitcher->setCalcLayout(LAMBDA_CALCLAYOUT_SIMPLE({
auto psParent = std::dynamic_pointer_cast<WzMultiWidget>(psWidget->parent());
ASSERT_OR_RETURN(, psParent != nullptr, "No parent");
int panelSwitcherWidth = psWidget->idealWidth();
int panelSwitcherX0 = (psParent->width() - panelSwitcherWidth) / 2;
psWidget->setGeometry(panelSwitcherX0, MULTIMENUFORM_INTERNAL_PADDING, panelSwitcherWidth, MULTIMENUFORM_PANEL_TABS_HEIGHT);
}));
}

switchAttachedPanel(multiMenuGrid);
}

std::shared_ptr<IntFormAnimated> intCreateMultiMenuForm(std::function<void ()> closeButtonHandler)
{
auto form = WzMultiWidget::make(true, closeButtonHandler);
return form;
}

bool intAddMultiMenu()
Expand All @@ -1270,33 +1440,18 @@ bool intAddMultiMenu()
intResetScreen(false);
}

auto form = std::make_shared<IntFormAnimated>();
form->id = MULTIMENU_FORM;

// Add the close button.
W_BUTINIT sButInit;
sButInit.id = MULTIMENU_CLOSE;
sButInit.pTip = _("Close");
sButInit.pDisplay = intDisplayImageHilight;
sButInit.UserData = PACKDWORD_TRI(0, IMAGE_CLOSEHILIGHT , IMAGE_CLOSE);
auto closeButton = std::make_shared<W_BUTTON>(&sButInit);
closeButton->addOnClickHandler([](W_BUTTON&) {
auto form = intCreateMultiMenuForm([]() {
widgScheduleTask([]() {
intCloseMultiMenu();
});
});
form->attach(closeButton);

auto grid = intCreateMultiMenuWidget();
form->attach(grid);

form->setCalcLayout([closeButton, grid](WIDGET *form) {
auto width = std::min((int32_t)screenWidth - 20, grid->idealWidth());
auto height = grid->idealHeight();
grid->setGeometry(0, 0, width, height);
form->id = MULTIMENU_FORM;
form->setCalcLayout([](WIDGET *form) {
auto width = std::min((int32_t)screenWidth - 20, form->idealWidth());
auto height = form->idealHeight();
form->setGeometry((screenWidth - width) / 2, MULTIMENU_FORM_Y, width, height);
closeButton->setGeometry(width - CLOSE_WIDTH, 0, CLOSE_WIDTH, CLOSE_HEIGHT);
});

psWScreen->psForm->attach(form);

intShowPowerBar(); // add power bar
Expand Down
4 changes: 3 additions & 1 deletion src/multimenu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ void displayRequestOption(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset);
bool intCloseMultiMenu();
void intCloseMultiMenuNoAnim();
bool intAddMultiMenu();
std::shared_ptr<WIDGET> intCreateMultiMenuWidget();

class IntFormAnimated;
std::shared_ptr<IntFormAnimated> intCreateMultiMenuForm(std::function<void ()> closeButtonHandler = nullptr);

void multiMenuScreenSizeDidChange(unsigned int oldWidth, unsigned int oldHeight, unsigned int newWidth, unsigned int newHeight);

Expand Down

0 comments on commit c1457c7

Please sign in to comment.