Skip to content

[GUI] Replace wxSheet in edit move dialog #949

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
tturocy merged 4 commits into from
Jun 19, 2026
Merged

[GUI] Replace wxSheet in edit move dialog #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2fff97b
Replace wxSheet with custom panel in EditMoveDialog
tturocy Jun 17, 2026
2f7734d
Re-add validator on the numeric fields for probabilities
tturocy Jun 17, 2026
9a5be9b
Scroll dialog on many actions, allow to be resizable
tturocy Jun 17, 2026
da4f59e
Merge branch 'master' into gui_move_dialog
tturocy Jun 18, 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
192 changes: 98 additions & 94 deletions src/gui/dleditmove.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,142 +24,134 @@
#ifndef WX_PRECOMP
#include <wx/wx.h>
#endif // WX_PRECOMP
#include <wx/scrolwin.h>
#include <wx/richmsgdlg.h>
#include "wx/sheet/sheet.h"

#include "gambit.h"
#include "dleditmove.h"
#include "renratio.h"
#include "valnumber.h"

namespace Gambit::GUI {

class ActionSheet final : public wxSheet {
GameInfoset m_infoset{nullptr};
wxSheetCellAttr m_labelAttr;
wxFont m_labelFont, m_cellFont;

// Overriding wxSheet members
wxSheetCellAttr GetAttr(const wxSheetCoords &p_coords, wxSheetAttr_Type) const override;
class ActionPanel final : public wxScrolledWindow {
std::vector<wxString> m_actionProbValues;
std::vector<wxTextCtrl *> m_actionNames;
std::vector<wxTextCtrl *> m_actionProbs;

public:
ActionSheet(wxWindow *p_parent, const GameInfoset &p_infoset);
ActionPanel(wxWindow *p_parent, const GameInfoset &p_infoset);

int NumActions() const { return GetNumberRows(); }
int NumActions() const { return static_cast<int>(m_actionNames.size()); }

wxString GetActionName(int p_act);
Array<Number> GetActionProbs();
wxString GetActionName(int p_act) const;
Array<Number> GetActionProbs() const;
};

ActionSheet::ActionSheet(wxWindow *p_parent, const GameInfoset &p_infoset)
: wxSheet(p_parent, wxID_ANY), m_infoset(p_infoset), m_labelFont(GetFont()),
m_cellFont(GetFont())
ActionPanel::ActionPanel(wxWindow *p_parent, const GameInfoset &p_infoset)
: wxScrolledWindow(p_parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxVSCROLL | wxTAB_TRAVERSAL)
{
m_labelFont.MakeBold();

m_labelAttr = GetSheetRefData()->m_defaultRowLabelAttr;
m_labelAttr.SetFont(m_labelFont);
m_labelAttr.SetAlignment(wxALIGN_CENTER, wxALIGN_CENTER);
m_labelAttr.SetOrientation(wxHORIZONTAL);
m_labelAttr.SetReadOnly(true);

CreateGrid(p_infoset->GetActions().size(), (p_infoset->IsChanceInfoset()) ? 2 : 1);
SetRowLabelWidth(40);
SetColLabelHeight(25);
SetColLabelValue(0, wxT("Label"));
if (p_infoset->IsChanceInfoset()) {
SetColLabelValue(1, wxT("Probability"));
const bool isChance = p_infoset->IsChanceInfoset();

if (isChance) {
m_actionProbValues.reserve(p_infoset->GetActions().size());
m_actionProbs.reserve(p_infoset->GetActions().size());
}
m_actionNames.reserve(p_infoset->GetActions().size());

const int numColumns = isChance ? 3 : 2;

auto *gridSizer = new wxFlexGridSizer(numColumns, 5, 10);
gridSizer->AddGrowableCol(1, 1);
if (isChance) {
gridSizer->AddGrowableCol(2, 1);
}

gridSizer->AddSpacer(1);
gridSizer->Add(new wxStaticText(this, wxID_STATIC, _("Label")), 0, wxALIGN_CENTER_VERTICAL);
if (isChance) {
gridSizer->Add(new wxStaticText(this, wxID_STATIC, _("Probability")), 0,
wxALIGN_CENTER_VERTICAL);
}

for (const auto &action : p_infoset->GetActions()) {
wxSheet::SetCellValue(wxSheetCoords(action->GetNumber() - 1, 0),
wxString(action->GetLabel().c_str(), *wxConvCurrent));
if (p_infoset->IsChanceInfoset()) {
wxSheet::SetCellValue(
wxSheetCoords(action->GetNumber() - 1, 1),
wxString(static_cast<std::string>(p_infoset->GetActionProb(action)).c_str(),
*wxConvCurrent));
wxString number;
number << action->GetNumber();

gridSizer->Add(new wxStaticText(this, wxID_STATIC, number), 0,
wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT);

auto *name =
new wxTextCtrl(this, wxID_ANY, wxString(action->GetLabel().c_str(), *wxConvCurrent));
m_actionNames.push_back(name);
gridSizer->Add(name, 1, wxEXPAND);

if (isChance) {
m_actionProbValues.emplace_back(
static_cast<std::string>(p_infoset->GetActionProb(action)).c_str(), *wxConvCurrent);

auto *probability =
new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0,
NumberValidator(&m_actionProbValues.back(), Rational(0), Rational(1)));

m_actionProbs.push_back(probability);
gridSizer->Add(probability, 1, wxEXPAND);
}
}
SetDefaultColWidth(150);
AutoSizeRows();
// This addresses a regression in wxWidgets 2.9.5 with using grids and
// sheets in sizers.
InvalidateBestSize();

auto *topSizer = new wxBoxSizer(wxVERTICAL);
topSizer->Add(gridSizer, 1, wxALL | wxEXPAND, 5);
SetSizer(topSizer);

SetScrollRate(0, FromDIP(10));
FitInside();

const wxSize bestSize = topSizer->CalcMin();
SetMinSize(wxSize(FromDIP(isChance ? 400 : 300), std::min(bestSize.GetHeight(), FromDIP(250))));
}

wxString ActionSheet::GetActionName(int p_act)
wxString ActionPanel::GetActionName(int p_act) const
{
if (IsCellEditControlCreated()) {
SaveEditControlValue();
}
if (IsCellEditControlShown()) {
HideCellEditControl();
}
return GetCellValue(wxSheetCoords(p_act - 1, 0));
return m_actionNames.at(p_act - 1)->GetValue();
}

Array<Number> ActionSheet::GetActionProbs()
Array<Number> ActionPanel::GetActionProbs() const
{
if (IsCellEditControlCreated()) {
SaveEditControlValue();
}
if (IsCellEditControlShown()) {
HideCellEditControl();
}
Array<Number> probs(NumActions());
for (int act = 1; act <= NumActions(); act++) {
probs[act] = Number(GetCellValue(wxSheetCoords(act - 1, 1)).ToStdString());
probs[act] = Number(m_actionProbs.at(act - 1)->GetValue().ToStdString());
}
return probs;
}

wxSheetCellAttr ActionSheet::GetAttr(const wxSheetCoords &p_coords, wxSheetAttr_Type) const
{
if (IsLabelCell(p_coords)) {
return m_labelAttr;
}

wxSheetCellAttr attr(GetSheetRefData()->m_defaultGridCellAttr);
attr.SetFont(m_cellFont);
attr.SetAlignment(wxALIGN_CENTER, wxALIGN_CENTER);
attr.SetOrientation(wxHORIZONTAL);
attr.SetReadOnly(false);
if (p_coords.GetCol() == 1) {
attr.SetRenderer(wxSheetCellRenderer(new RationalRendererRefData()));
attr.SetEditor(wxSheetCellEditor(new RationalEditorRefData()));
}
else {
attr.SetEditor(wxSheetCellEditor(new wxSheetCellTextEditorRefData()));
}
return attr;
}

//======================================================================
// class EditMoveDialog
//======================================================================

EditMoveDialog::EditMoveDialog(wxWindow *p_parent, const GameInfoset &p_infoset)
: wxDialog(p_parent, wxID_ANY, _("Move properties"), wxDefaultPosition), m_infoset(p_infoset)
: wxDialog(p_parent, wxID_ANY, _("Move properties"), wxDefaultPosition, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER),
m_infoset(p_infoset)
{
auto *topSizer = new wxBoxSizer(wxVERTICAL);

auto *labelSizer = new wxBoxSizer(wxHORIZONTAL);
labelSizer->Add(new wxStaticText(this, wxID_STATIC, _("Information set label")), 0,
wxALL | wxALIGN_CENTER, 5);
wxALL | wxALIGN_CENTER_VERTICAL, 5);
m_infosetName =
new wxTextCtrl(this, wxID_ANY, wxString(p_infoset->GetLabel().c_str(), *wxConvCurrent));
labelSizer->Add(m_infosetName, 1, wxALL | wxEXPAND, 5);
topSizer->Add(labelSizer, 0, wxALL | wxEXPAND, 0);
topSizer->Add(labelSizer, 0, wxEXPAND);

{
wxString label;
label << _("Number of members: ") << p_infoset->GetMembers().size();
topSizer->Add(new wxStaticText(this, wxID_STATIC, label), 0, wxALL | wxALIGN_CENTER, 5);
topSizer->Add(new wxStaticText(this, wxID_STATIC, label), 0, wxLEFT | wxRIGHT | wxBOTTOM, 5);
}

auto *playerSizer = new wxBoxSizer(wxHORIZONTAL);
playerSizer->Add(new wxStaticText(this, wxID_STATIC, _("Belongs to player")), 0,
wxALL | wxALIGN_CENTER, 5);
wxALL | wxALIGN_CENTER_VERTICAL, 5);
m_player = new wxChoice(this, wxID_ANY);
if (p_infoset->IsChanceInfoset()) {
m_player->Append(_("Chance"));
Expand All @@ -175,18 +167,29 @@ EditMoveDialog::EditMoveDialog(wxWindow *p_parent, const GameInfoset &p_infoset)
m_player->SetSelection(p_infoset->GetPlayer()->GetNumber() - 1);
}
playerSizer->Add(m_player, 1, wxALL | wxEXPAND, 5);
topSizer->Add(playerSizer, 0, wxALL | wxEXPAND, 0);
topSizer->Add(playerSizer, 0, wxEXPAND);

auto *actionBoxSizer =
new wxStaticBoxSizer(new wxStaticBox(this, wxID_STATIC, _("Actions")), wxHORIZONTAL);
m_actionSheet = new ActionSheet(this, p_infoset);
actionBoxSizer->Add(m_actionSheet, 1, wxALL | wxEXPAND, 5);
topSizer->Add(actionBoxSizer, 0, wxALL | wxEXPAND, 5);
new wxStaticBoxSizer(new wxStaticBox(this, wxID_STATIC, _("Actions")), wxVERTICAL);
m_actionPanel = new ActionPanel(this, p_infoset);

const int visibleRows = std::min(static_cast<int>(p_infoset->GetActions().size()), 10);
const int rowHeight = FromDIP(32);
const int headerHeight = FromDIP(28);
m_actionPanel->SetMinSize(wxSize(FromDIP(p_infoset->IsChanceInfoset() ? 400 : 300),
headerHeight + visibleRows * rowHeight));

actionBoxSizer->Add(m_actionPanel, 1, wxALL | wxEXPAND, 5);
topSizer->Add(actionBoxSizer, 1, wxALL | wxEXPAND, 5);

if (auto *buttons = CreateSeparatedButtonSizer(wxOK | wxCANCEL)) {
topSizer->Add(buttons, 0, wxALL | wxEXPAND, 5);
}
SetSizerAndFit(topSizer);

SetSizer(topSizer);
topSizer->SetSizeHints(this);
SetSize(GetBestSize());
SetMinSize(GetSize());
CenterOnParent();

Bind(wxEVT_BUTTON, &EditMoveDialog::OnOK, this, wxID_OK);
Expand All @@ -199,7 +202,7 @@ void EditMoveDialog::OnOK(wxCommandEvent &p_event)
return;
}
try {
ValidateDistribution(m_actionSheet->GetActionProbs());
ValidateDistribution(m_actionPanel->GetActionProbs());
}
catch (ValueException &) {
wxRichMessageDialog(this, "Probabilities must be nonnegative numbers summing to one.", "Error",
Expand All @@ -210,12 +213,13 @@ void EditMoveDialog::OnOK(wxCommandEvent &p_event)
p_event.Skip();
}

int EditMoveDialog::NumActions() const { return m_actionSheet->NumActions(); }
int EditMoveDialog::NumActions() const { return m_actionPanel->NumActions(); }

wxString EditMoveDialog::GetActionName(int p_act) const
{
return m_actionSheet->GetActionName(p_act);
return m_actionPanel->GetActionName(p_act);
}

Array<Number> EditMoveDialog::GetActionProbs() const { return m_actionSheet->GetActionProbs(); }
Array<Number> EditMoveDialog::GetActionProbs() const { return m_actionPanel->GetActionProbs(); }

} // namespace Gambit::GUI
4 changes: 2 additions & 2 deletions src/gui/dleditmove.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
#define GAMBIT_GUI_DLEDITMOVE_H

namespace Gambit::GUI {
class ActionSheet;
class ActionPanel;

class EditMoveDialog final : public wxDialog {
GameInfoset m_infoset;
wxChoice *m_player;
wxTextCtrl *m_infosetName;
ActionSheet *m_actionSheet;
ActionPanel *m_actionPanel;

void OnOK(wxCommandEvent &);

Expand Down
Loading