Store open dialogs in an unsorted vector

Even if every dialog in the program was open at once, linearly searching
a vector is quite fast enough.
This commit is contained in:
Thomas Goyne 2014-07-05 09:00:02 -07:00
parent f0f836c47b
commit e924db1fda
1 changed files with 30 additions and 31 deletions

View File

@ -18,7 +18,7 @@
#include <libaegisub/exception.h> #include <libaegisub/exception.h>
#include <map> #include <vector>
#include <typeinfo> #include <typeinfo>
#include <wx/dialog.h> #include <wx/dialog.h>
@ -30,17 +30,9 @@ namespace agi { struct Context; }
/// created, so that commands can be send to the appropriate places and so that /// created, so that commands can be send to the appropriate places and so that
/// the same dialog can't be opened twice at once. /// the same dialog can't be opened twice at once.
class DialogManager { class DialogManager {
/// Comparer for pointers to std::type_info using dialog_pair = std::pair<const std::type_info *, wxDialog *>;
struct type_info_lt {
bool operator()(const std::type_info *lft, const std::type_info *rgt) const {
return !!lft->before(*rgt);
}
};
typedef std::map<const std::type_info *, wxDialog *, type_info_lt> DialogMap;
/// Dialogs which currently exist /// Dialogs which currently exist
DialogMap created_dialogs; std::vector<dialog_pair> created_dialogs;
/// Close handler which deletes and unregisters closed modeless dialogs /// Close handler which deletes and unregisters closed modeless dialogs
template<typename Event> template<typename Event>
@ -58,21 +50,30 @@ class DialogManager {
} }
} }
template<typename T>
std::vector<dialog_pair>::iterator Find() {
for (auto it = begin(created_dialogs); it != end(created_dialogs); ++it) {
if (*it->first == typeid(T))
return it;
}
return end(created_dialogs);
}
public: public:
/// Show a modeless dialog of the given type, creating it if needed /// Show a modeless dialog of the given type, creating it if needed
/// @tparam DialogType Type of dialog to show /// @tparam DialogType Type of dialog to show
template<class DialogType> template<class DialogType>
void Show(agi::Context *c) { void Show(agi::Context *c) {
auto it = created_dialogs.find(&typeid(DialogType)); for (auto const& diag : created_dialogs) {
if (*diag.first == typeid(DialogType)) {
if (it != created_dialogs.end()) { diag.second->Show();
it->second->Show(); diag.second->SetFocus();
it->second->SetFocus();
} }
else { }
try { try {
wxDialog *d = new DialogType(c); wxDialog *d = new DialogType(c);
created_dialogs[&typeid(DialogType)] = d; created_dialogs.emplace_back(&typeid(DialogType), d);
d->Bind(wxEVT_CLOSE_WINDOW, &DialogManager::OnClose<wxCloseEvent>, this); d->Bind(wxEVT_CLOSE_WINDOW, &DialogManager::OnClose<wxCloseEvent>, this);
d->Bind(wxEVT_BUTTON, &DialogManager::OnClose<wxCommandEvent>, this, wxID_CANCEL); d->Bind(wxEVT_BUTTON, &DialogManager::OnClose<wxCommandEvent>, this, wxID_CANCEL);
d->Show(); d->Show();
@ -80,22 +81,21 @@ public:
} }
catch (agi::UserCancelException const&) { } catch (agi::UserCancelException const&) { }
} }
}
/// Show a modal dialog of the given type, creating it if needed /// Show a modal dialog of the given type, creating it if needed
/// @tparam DialogType Type of dialog to show /// @tparam DialogType Type of dialog to show
template<class DialogType> template<class DialogType>
void ShowModal(agi::Context *c) { void ShowModal(agi::Context *c) {
DialogType diag(c); DialogType diag(c);
created_dialogs[&typeid(DialogType)] = &diag; created_dialogs.emplace_back(&typeid(DialogType), &diag);
try { try {
diag.ShowModal(); diag.ShowModal();
} }
catch (...) { catch (...) {
created_dialogs.erase(&typeid(DialogType)); created_dialogs.erase(Find<DialogType>());
throw; throw;
} }
created_dialogs.erase(&typeid(DialogType)); created_dialogs.erase(Find<DialogType>());
} }
/// Get the dialog of the given type /// Get the dialog of the given type
@ -103,7 +103,7 @@ public:
/// @return A pointer to a DialogType or nullptr if no dialog of the given type has been created /// @return A pointer to a DialogType or nullptr if no dialog of the given type has been created
template<class DialogType> template<class DialogType>
DialogType *Get() const { DialogType *Get() const {
auto it = created_dialogs.find(&typeid(DialogType)); auto it = const_cast<DialogManager *>(this)->Find<DialogType>();
return it != created_dialogs.end() ? static_cast<DialogType*>(it->second) : nullptr; return it != created_dialogs.end() ? static_cast<DialogType*>(it->second) : nullptr;
} }
@ -113,6 +113,5 @@ public:
it.second->Unbind(wxEVT_BUTTON, &DialogManager::OnClose<wxCommandEvent>, this, wxID_CANCEL); it.second->Unbind(wxEVT_BUTTON, &DialogManager::OnClose<wxCommandEvent>, this, wxID_CANCEL);
it.second->Destroy(); it.second->Destroy();
} }
created_dialogs.clear();
} }
}; };