amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: Add Cards toolbar submenu initial load content (fixes twanvl#153)

Browse Source 
This commit is what broke it, but it did so while referencing some cross platform incompatibility. I hope the method done by this fix avoids that compatibility issue.
This commit is contained in:
Brendan Hagan
2022-07-17 02:00:42 -04:00
parent 54be634b86
commit 30b9919c82
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES.md
+3
View File
@@ -7,6 +7,9 @@ HEAD: new items added as changes are made
Features: Features:
Bug fixes:
* Fix Add Cards toolbar not showing script multi-add functions on initial load (twanvl#153)
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
version 2.2.0 (Unofficial), 2022-07-16 version 2.2.0 (Unofficial), 2022-07-16
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
src/gui/set/cards_panel.cpp
+6 -4
View File
@@ -153,8 +153,10 @@ void CardsPanel::onChangeSet() {
menuCard->Remove(ID_CARD_ADD_MULT); menuCard->Remove(ID_CARD_ADD_MULT);
((wxMenu*)menuCard)->Insert(4,insertManyCardsMenu); // HACK: the position is hardcoded ((wxMenu*)menuCard)->Insert(4,insertManyCardsMenu); // HACK: the position is hardcoded
// also for the toolbar dropdown menu // also for the toolbar dropdown menu
if (toolAddCard) { if (toolAddCard) {
toolAddCard->SetDropdownMenu(makeAddCardsSubmenu(true)); // Originally this was using the menu directly, but there are compatibility issues apparently.
// At this point it might be possible to just store a reference to the toolbar directly instead.
toolAddCard->GetToolBar()->SetDropdownMenu(ID_CARD_ADD, makeAddCardsSubmenu(true));
} }
} }
@@ -186,7 +188,7 @@ void CardsPanel::initUI(wxToolBar* tb, wxMenuBar* mb) {
add_tool_tr(tb, ID_FORMAT_SYMBOL, "symbol", "symbols", false, wxITEM_CHECK); add_tool_tr(tb, ID_FORMAT_SYMBOL, "symbol", "symbols", false, wxITEM_CHECK);
add_tool_tr(tb, ID_FORMAT_REMINDER, "reminder", "reminder_text", false, wxITEM_CHECK); add_tool_tr(tb, ID_FORMAT_REMINDER, "reminder", "reminder_text", false, wxITEM_CHECK);
tb->AddSeparator(); tb->AddSeparator();
add_tool_tr(tb, ID_CARD_ADD, "card_add", "add_card", false, wxITEM_DROPDOWN); toolAddCard = add_tool_tr(tb, ID_CARD_ADD, "card_add", "add_card", false, wxITEM_DROPDOWN);
tb->SetDropdownMenu(ID_CARD_ADD, makeAddCardsSubmenu(true)); tb->SetDropdownMenu(ID_CARD_ADD, makeAddCardsSubmenu(true));
add_tool_tr(tb, ID_CARD_REMOVE, "card_del", "remove_card"); add_tool_tr(tb, ID_CARD_REMOVE, "card_del", "remove_card");
tb->AddSeparator(); tb->AddSeparator();
@@ -492,4 +494,4 @@ void CardsPanel::selectFirstCard() {
void CardsPanel::getCardLists(vector<CardListBase*>& out) { void CardsPanel::getCardLists(vector<CardListBase*>& out) {
out.push_back(card_list); out.push_back(card_list);
} }