Skip to content

Tidy and standardise dialog layout and styling #1086

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 3 commits into from
Aug 27, 2026
Merged

Tidy and standardise dialog layout and styling #1086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61a4016
Tidy and standardise dialog layout and styling.
tturocy Aug 26, 2026
1a5a0b9
Adding missing files for new unified logit dialog
tturocy Aug 27, 2026
1205699
Merge branch 'master' into gui_dialogs
tturocy Aug 27, 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
6 changes: 2 additions & 4 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,6 @@ gambit_SOURCES = \
src/gui/dlefglayout.h \
src/gui/dlefglegend.cc \
src/gui/dlefglegend.h \
src/gui/dlefglogit.cc \
src/gui/dlefglogit.h \
src/gui/dlefgreveal.cc \
src/gui/dlexcept.h \
src/gui/dlgameprop.cc \
Expand All @@ -477,8 +475,8 @@ gambit_SOURCES = \
src/gui/nashspec.h \
src/gui/dlnewtable.cc \
src/gui/dlnewtable.h \
src/gui/dlnfglogit.cc \
src/gui/dlnfglogit.h \
src/gui/dllogit.cc \
src/gui/dllogit.h \
src/gui/efgdisplay.cc \
src/gui/efgdisplay.h \
src/gui/efgdragdrop.cc \
Expand Down
41 changes: 21 additions & 20 deletions src/gui/dleditnode.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,23 @@ namespace Gambit::GUI {
//======================================================================

EditNodeDialog::EditNodeDialog(wxWindow *p_parent, const GameNode &p_node)
: wxDialog(p_parent, wxID_ANY, _("Node properties"), wxDefaultPosition), m_node(p_node)
: wxDialog(p_parent, wxID_ANY, _("Node properties"), wxDefaultPosition, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER),
m_node(p_node)
{
const int S = FromDIP(5);

auto *topSizer = new wxBoxSizer(wxVERTICAL);

auto *labelSizer = new wxBoxSizer(wxHORIZONTAL);
labelSizer->Add(new wxStaticText(this, wxID_STATIC, _("Node label")), 0, wxALL | wxCENTER, 5);
labelSizer->Add(new wxStaticText(this, wxID_STATIC, _("Node label")), 0, wxALL | wxCENTER, S);
m_nodeLabel = new LabelTextCtrl(this, wxID_ANY, wxString::FromUTF8(m_node->GetLabel()));
labelSizer->Add(m_nodeLabel, 1, wxALL | wxCENTER | wxEXPAND, 5);
topSizer->Add(labelSizer, 0, wxALL | wxEXPAND, 5);
labelSizer->Add(m_nodeLabel, 1, wxALL | wxCENTER | wxEXPAND, S);
topSizer->Add(labelSizer, 0, wxALL | wxEXPAND, S);

auto *infosetSizer = new wxBoxSizer(wxHORIZONTAL);
infosetSizer->Add(new wxStaticText(this, wxID_STATIC, _("Information set")), 0, wxALL | wxCENTER,
5);
S);
m_infoset = new wxChoice(this, wxID_ANY);
if (!p_node->IsTerminal()) {
m_infoset->Append(_("New information set"));
Expand Down Expand Up @@ -89,23 +93,23 @@ EditNodeDialog::EditNodeDialog(wxWindow *p_parent, const GameNode &p_node)
m_infoset->SetSelection(0);
m_infoset->Enable(false);
}
infosetSizer->Add(m_infoset, 1, wxALL | wxEXPAND, 5);
topSizer->Add(infosetSizer, 0, wxALL | wxEXPAND, 5);
infosetSizer->Add(m_infoset, 1, wxALL | wxEXPAND, S);
topSizer->Add(infosetSizer, 0, wxALL | wxEXPAND, S);

auto *subgameSizer = new wxBoxSizer(wxVERTICAL);
if (!p_node->GetParent()) {
subgameSizer->Add(new wxStaticText(this, wxID_STATIC, _("This is the root node of the tree")),
0, wxALL | wxCENTER, 5);
0, wxALL | wxCENTER, S);
}
else if (p_node->IsSubgameRoot()) {
subgameSizer->Add(
new wxStaticText(this, wxID_STATIC, _("This is the root of a proper subgame")), 0,
wxALL | wxCENTER, 5);
wxALL | wxCENTER, S);
}
topSizer->Add(subgameSizer, 0, wxALL | wxCENTER, 5);
topSizer->Add(subgameSizer, 0, wxALL | wxCENTER, S);

auto *outcomeSizer = new wxBoxSizer(wxHORIZONTAL);
outcomeSizer->Add(new wxStaticText(this, wxID_STATIC, _("Outcome")), 0, wxALL | wxCENTER, 5);
outcomeSizer->Add(new wxStaticText(this, wxID_STATIC, _("Outcome")), 0, wxALL | wxCENTER, S);
m_outcome = new wxChoice(this, wxID_ANY);
m_outcome->Append(_("(null)"));
m_outcome->SetSelection(0);
Expand Down Expand Up @@ -137,15 +141,12 @@ EditNodeDialog::EditNodeDialog(wxWindow *p_parent, const GameNode &p_node)
m_outcome->SetSelection(outcome->GetNumber());
}
}
outcomeSizer->Add(m_outcome, 1, wxALL | wxEXPAND, 5);
topSizer->Add(outcomeSizer, 0, wxALL | wxEXPAND, 5);

auto *buttonSizer = new wxBoxSizer(wxHORIZONTAL);
buttonSizer->Add(new wxButton(this, wxID_CANCEL, _("Cancel")), 0, wxALL, 5);
auto *okButton = new wxButton(this, wxID_OK, _("OK"));
okButton->SetDefault();
buttonSizer->Add(okButton, 0, wxALL, 5);
topSizer->Add(buttonSizer, 0, wxALL | wxALIGN_RIGHT, 5);
outcomeSizer->Add(m_outcome, 1, wxALL | wxEXPAND, S);
topSizer->Add(outcomeSizer, 0, wxALL | wxEXPAND, S);

if (auto *buttonSizer = CreateStdDialogButtonSizer(wxOK | wxCANCEL)) {
topSizer->Add(buttonSizer, 0, wxALL | wxEXPAND, S);
}

SetSizer(topSizer);
topSizer->Fit(this);
Expand Down
86 changes: 48 additions & 38 deletions src/gui/dlefglayout.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ class LayoutNodesPanel final : public wxPanel {
LayoutNodesPanel::LayoutNodesPanel(wxWindow *p_parent, const TreeRenderConfig &p_settings)
: wxPanel(p_parent, wxID_ANY)
{
const int S = FromDIP(5);

auto *topSizer = new wxBoxSizer(wxVERTICAL);

auto *nodeSizer = new wxStaticBoxSizer(wxVERTICAL, this, _T("Drawing nodes"));
Expand All @@ -71,34 +73,34 @@ LayoutNodesPanel::LayoutNodesPanel(wxWindow *p_parent, const TreeRenderConfig &p
_("a diamond"), _("a filled circle")};

tokenSizer->Add(new wxStaticText(this, wxID_STATIC, _("Indicate chance nodes with")), 0,
wxALL | wxALIGN_CENTER_VERTICAL, 5);
wxALL | wxALIGN_CENTER_VERTICAL, S);
m_chanceToken = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 5, tokenChoices);
m_chanceToken->SetSelection(p_settings.GetChanceToken());
tokenSizer->Add(m_chanceToken, 1, wxALL | wxEXPAND, 5);
tokenSizer->Add(m_chanceToken, 1, wxALL | wxEXPAND, S);

tokenSizer->Add(new wxStaticText(this, wxID_STATIC, _("Indicate player nodes with")), 0,
wxALL | wxALIGN_CENTER_VERTICAL, 5);
wxALL | wxALIGN_CENTER_VERTICAL, S);
m_playerToken = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 5, tokenChoices);
m_playerToken->SetSelection(p_settings.GetPlayerToken());
tokenSizer->Add(m_playerToken, 1, wxALL | wxEXPAND, 5);
tokenSizer->Add(m_playerToken, 1, wxALL | wxEXPAND, S);

tokenSizer->Add(new wxStaticText(this, wxID_STATIC, _("Indicate terminal nodes with")), 0,
wxALL | wxALIGN_CENTER_VERTICAL, 5);
wxALL | wxALIGN_CENTER_VERTICAL, S);
m_terminalToken =
new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 5, tokenChoices);
m_terminalToken->SetSelection(p_settings.GetTerminalToken());
tokenSizer->Add(m_terminalToken, 1, wxALL | wxEXPAND, 5);
tokenSizer->Add(m_terminalToken, 1, wxALL | wxEXPAND, S);

nodeSizer->Add(tokenSizer, 1, wxALL | wxEXPAND, 5);
topSizer->Add(nodeSizer, 0, wxALL | wxALIGN_CENTER, 5);
nodeSizer->Add(tokenSizer, 1, wxALL | wxEXPAND, S);
topSizer->Add(nodeSizer, 0, wxALL | wxALIGN_CENTER, S);

auto *sizeSizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Layout sizing"));

auto *gridSizer = new wxFlexGridSizer(2);
gridSizer->AddGrowableCol(1);

gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Horizontal size of nodes")), 0,
wxALIGN_CENTER_VERTICAL | wxALL, 5);
wxALIGN_CENTER_VERTICAL | wxALL, S);

{
constexpr int NODE_LENGTH_MIN = 5;
Expand All @@ -107,11 +109,11 @@ LayoutNodesPanel::LayoutNodesPanel(wxWindow *p_parent, const TreeRenderConfig &p
label << p_settings.GetNodeSize();
m_nodeSize = new wxSpinCtrl(this, wxID_ANY, label, wxDefaultPosition, wxDefaultSize,
wxSP_ARROW_KEYS, NODE_LENGTH_MIN, NODE_LENGTH_MAX);
gridSizer->Add(m_nodeSize, 1, wxEXPAND | wxALL, 5);
gridSizer->Add(m_nodeSize, 1, wxEXPAND | wxALL, S);
}

gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Vertical spacing between terminal nodes")), 0,
wxALIGN_CENTER_VERTICAL | wxALL, 5);
wxALIGN_CENTER_VERTICAL | wxALL, S);

{
constexpr int Y_SPACING_MIN = 15;
Expand All @@ -120,11 +122,11 @@ LayoutNodesPanel::LayoutNodesPanel(wxWindow *p_parent, const TreeRenderConfig &p
label << p_settings.GetTerminalSpacing();
m_terminalSpacing = new wxSpinCtrl(this, wxID_ANY, label, wxDefaultPosition, wxDefaultSize,
wxSP_ARROW_KEYS, Y_SPACING_MIN, Y_SPACING_MAX);
gridSizer->Add(m_terminalSpacing, 1, wxEXPAND | wxALL, 5);
gridSizer->Add(m_terminalSpacing, 1, wxEXPAND | wxALL, S);
}

sizeSizer->Add(gridSizer, 1, wxALL | wxEXPAND, 5);
topSizer->Add(sizeSizer, 0, wxALL | wxALIGN_CENTER, 5);
sizeSizer->Add(gridSizer, 1, wxALL | wxEXPAND, S);
topSizer->Add(sizeSizer, 0, wxALL | wxALIGN_CENTER, S);

SetSizer(topSizer);
topSizer->Fit(this);
Expand Down Expand Up @@ -155,29 +157,31 @@ class LayoutBranchesPanel : public wxPanel {
LayoutBranchesPanel::LayoutBranchesPanel(wxWindow *p_parent, const TreeRenderConfig &p_settings)
: wxPanel(p_parent, wxID_ANY)
{
const int S = FromDIP(5);

auto *topSizer = new wxBoxSizer(wxVERTICAL);

auto *styleBoxSizer = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Drawing branches"));

auto *styleSizer = new wxFlexGridSizer(2);

styleSizer->Add(new wxStaticText(this, wxID_STATIC, _("Draw branches")), 0,
wxALL | wxALIGN_CENTER_VERTICAL, 5);
wxALL | wxALIGN_CENTER_VERTICAL, S);
wxString styleChoices[] = {_("using straight lines between nodes"),
_("with a tine for branch labels")};
m_branchStyle = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 2, styleChoices);
m_branchStyle->SetSelection(p_settings.GetBranchStyle());
styleSizer->Add(m_branchStyle, 1, wxALL | wxEXPAND, 5);
styleSizer->Add(m_branchStyle, 1, wxALL | wxEXPAND, S);

styleSizer->Add(new wxStaticText(this, wxID_STATIC, _("Draw labels")), 1,
wxALL | wxALIGN_CENTER_VERTICAL, 5);
wxALL | wxALIGN_CENTER_VERTICAL, S);
wxString labelChoices[] = {_("horizontally"), _("rotated parallel to the branch")};
m_branchLabels = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 2, labelChoices);
m_branchLabels->SetSelection(p_settings.GetBranchLabels());
styleSizer->Add(m_branchLabels, 1, wxALL | wxEXPAND, 5);
styleSizer->Add(m_branchLabels, 1, wxALL | wxEXPAND, S);

styleBoxSizer->Add(styleSizer, 1, wxALL | wxEXPAND, 5);
topSizer->Add(styleBoxSizer, 0, wxALL | wxALIGN_CENTER, 5);
styleBoxSizer->Add(styleSizer, 1, wxALL | wxEXPAND, S);
topSizer->Add(styleBoxSizer, 0, wxALL | wxALIGN_CENTER, S);

auto *lengthSizer = new wxStaticBoxSizer(wxHORIZONTAL, this, _T("size of branches"));

Expand All @@ -188,28 +192,28 @@ LayoutBranchesPanel::LayoutBranchesPanel(wxWindow *p_parent, const TreeRenderCon
constexpr int BRANCH_LENGTH_MIN = 0;
constexpr int BRANCH_LENGTH_MAX = 100;
gridSizer->Add(new wxStaticText(this, wxID_ANY, _("size of branch fork")), 0,
wxALIGN_CENTER_VERTICAL | wxALL, 5);
wxALIGN_CENTER_VERTICAL | wxALL, S);
wxString label;
label << p_settings.GetBranchLength();
m_branchLength = new wxSpinCtrl(this, wxID_ANY, label, wxDefaultPosition, wxDefaultSize,
wxSP_ARROW_KEYS, BRANCH_LENGTH_MIN, BRANCH_LENGTH_MAX);
gridSizer->Add(m_branchLength, 1, wxALL | wxEXPAND, 5);
gridSizer->Add(m_branchLength, 1, wxALL | wxEXPAND, S);
}

{
constexpr int TINE_LENGTH_MIN = 20;
constexpr int TINE_LENGTH_MAX = 100;
gridSizer->Add(new wxStaticText(this, wxID_ANY, _("size of branch tine")), 1,
wxALIGN_CENTER_VERTICAL | wxALL, 5);
wxALIGN_CENTER_VERTICAL | wxALL, S);
wxString label;
label << p_settings.GetTineLength();
m_tineLength = new wxSpinCtrl(this, wxID_ANY, label, wxDefaultPosition, wxDefaultSize,
wxSP_ARROW_KEYS, TINE_LENGTH_MIN, TINE_LENGTH_MAX);
gridSizer->Add(m_tineLength, 1, wxALL | wxEXPAND, 5);
gridSizer->Add(m_tineLength, 1, wxALL | wxEXPAND, S);
}

lengthSizer->Add(gridSizer, 1, wxALL | wxEXPAND, 5);
topSizer->Add(lengthSizer, 0, wxALL | wxALIGN_CENTER, 5);
lengthSizer->Add(gridSizer, 1, wxALL | wxEXPAND, S);
topSizer->Add(lengthSizer, 0, wxALL | wxALIGN_CENTER, S);

SetSizer(topSizer);
topSizer->Fit(this);
Expand All @@ -232,20 +236,22 @@ class LayoutInfosetsPanel final : public wxPanel {
LayoutInfosetsPanel::LayoutInfosetsPanel(wxWindow *p_parent, const TreeRenderConfig &p_settings)
: wxPanel(p_parent, wxID_ANY)
{
const int S = FromDIP(5);

auto *topSizer = new wxBoxSizer(wxVERTICAL);

auto *infosetSizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Drawing information sets"));

auto *styleSizer = new wxFlexGridSizer(2);

styleSizer->Add(new wxStaticText(this, wxID_STATIC, _("Draw information set connections")), 0,
wxALL | wxALIGN_CENTER_VERTICAL, 5);
wxALL | wxALIGN_CENTER_VERTICAL, S);
wxString joinChoices[] = {_("using lines"), _("using bubbles")};
m_infosetJoin = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 2, joinChoices);
m_infosetJoin->SetSelection(p_settings.GetInfosetJoin());
styleSizer->Add(m_infosetJoin, 0, wxALL | wxEXPAND, 5);
infosetSizer->Add(styleSizer, 0, wxALL | wxALIGN_CENTER, 5);
topSizer->Add(infosetSizer, 0, wxALL, 5);
styleSizer->Add(m_infosetJoin, 0, wxALL | wxEXPAND, S);
infosetSizer->Add(styleSizer, 0, wxALL | wxALIGN_CENTER, S);
topSizer->Add(infosetSizer, 0, wxALL, S);

SetSizer(topSizer);
topSizer->Fit(this);
Expand All @@ -256,8 +262,12 @@ LayoutInfosetsPanel::LayoutInfosetsPanel(wxWindow *p_parent, const TreeRenderCon
} // anonymous namespace

LayoutDialog::LayoutDialog(wxWindow *p_parent, const TreeRenderConfig &p_settings)
: wxDialog(p_parent, wxID_ANY, _("Layout options"), wxDefaultPosition), m_toDefaults(false)
: wxDialog(p_parent, wxID_ANY, _("Layout options"), wxDefaultPosition, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER),
m_toDefaults(false)
{
const int S = FromDIP(5);

m_notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize);
m_notebook->AddPage(new LayoutNodesPanel(m_notebook, p_settings), _("Nodes"));
m_notebook->AddPage(new LayoutBranchesPanel(m_notebook, p_settings), _("Branches"));
Expand All @@ -267,15 +277,15 @@ LayoutDialog::LayoutDialog(wxWindow *p_parent, const TreeRenderConfig &p_setting
auto *defaultsButton = new wxButton(this, wxID_ANY, _("Set to defaults"));
Connect(defaultsButton->GetId(), wxEVT_COMMAND_BUTTON_CLICKED,
wxCommandEventHandler(LayoutDialog::OnSetDefaults));
buttonSizer->Add(defaultsButton, 0, wxALL, 5);
buttonSizer->Add(new wxButton(this, wxID_CANCEL, _("Cancel")), 0, wxALL, 5);
auto *okButton = new wxButton(this, wxID_OK, _("OK"));
okButton->SetDefault();
buttonSizer->Add(okButton, 0, wxALL, 5);
buttonSizer->Add(defaultsButton, 0, wxALL, S);
buttonSizer->AddStretchSpacer();
if (auto *stdButtons = CreateStdDialogButtonSizer(wxOK | wxCANCEL)) {
buttonSizer->Add(stdButtons, 0, wxALL, S);
}

auto *topSizer = new wxBoxSizer(wxVERTICAL);
topSizer->Add(m_notebook, 0, wxEXPAND | wxALL, 5);
topSizer->Add(buttonSizer, 0, wxALL | wxALIGN_RIGHT, 5);
topSizer->Add(m_notebook, 0, wxEXPAND | wxALL, S);
topSizer->Add(buttonSizer, 0, wxEXPAND | wxALL, S);

SetSizer(topSizer);
topSizer->Fit(this);
Expand Down
Loading
Loading