flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-25 02:05:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix X-Plane checkable menu items

Browse Source 
- menuItem ref was wrong
- CMenuItem::setChecked did not use the menu enum
- Remove the checked argument to CMenuItem constructor
This commit is contained in:
Roland Winklmeier
2018-09-24 16:45:12 +02:00
committed by Klaus Basan
parent 84f1e21cf8
commit 41ac858df8
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/xswiftbus/menus.cpp
View File

@@ -54,7 +54,7 @@ namespace XSwiftBus
{ {
assert(! name.empty()); assert(! name.empty());
m_data->items->emplace_back( m_data->items->emplace_back(
CMenuItem { m_data->id, 0, false, false, [callback](bool) { callback(); } } CMenuItem { m_data->id, 0, false, [callback](bool) { callback(); } }
); );
auto &menuItem = m_data->items->back(); auto &menuItem = m_data->items->back();
menuItem.setIndex(XPLMAppendMenuItem(m_data->id, name.c_str(), &menuItem, false)); menuItem.setIndex(XPLMAppendMenuItem(m_data->id, name.c_str(), &menuItem, false));
@@ -65,10 +65,11 @@ namespace XSwiftBus
{ {
assert(!name.empty()); assert(!name.empty());
m_data->items->emplace_back( m_data->items->emplace_back(
CMenuItem{ m_data->id, 0, true, checked, callback } CMenuItem{ m_data->id, 0, true, callback }
); );
auto &menuItem = m_data->items->back(); auto &menuItem = m_data->items->back();
menuItem.setIndex(XPLMAppendMenuItem(m_data->id, name.c_str(), voidptr_cast(m_data->items->size() + 1), false)); menuItem.setIndex(XPLMAppendMenuItem(m_data->id, name.c_str(), &menuItem, false));
menuItem.setChecked(checked);
return menuItem; return menuItem;
} }
@@ -113,13 +114,9 @@ namespace XSwiftBus
} }
} }
CMenuItem::CMenuItem(XPLMMenuID parent, int item, bool checkable, bool checked, std::function<void(bool)> callback) CMenuItem::CMenuItem(XPLMMenuID parent, int item, bool checkable, std::function<void(bool)> callback)
: m_data(std::make_shared<Data>(parent, item, checkable, callback)) : m_data(std::make_shared<Data>(parent, item, checkable, callback))
{ {
if (checkable)
{
setChecked(checked);
}
} }
bool CMenuItem::getChecked() const bool CMenuItem::getChecked() const
@@ -131,7 +128,7 @@ namespace XSwiftBus
void CMenuItem::setChecked(bool checked) void CMenuItem::setChecked(bool checked)
{ {
XPLMCheckMenuItem(m_data->parent, m_data->index, checked); XPLMCheckMenuItem(m_data->parent, m_data->index, checked ? xplm_Menu_Checked : xplm_Menu_Unchecked);
} }
void CMenuItem::setEnabled(bool enabled) void CMenuItem::setEnabled(bool enabled)

2
src/xswiftbus/menus.h
View File

@@ -43,7 +43,7 @@ namespace XSwiftBus
private: private:
friend class CMenu; friend class CMenu;
CMenuItem(XPLMMenuID parent, int item, bool checkable, bool checked, std::function<void(bool)> callback); CMenuItem(XPLMMenuID parent, int item, bool checkable, std::function<void(bool)> callback);
void setIndex(int index) { m_data->index = index; } void setIndex(int index) { m_data->index = index; }