This commit is contained in:
Jinhao
2017-03-29 04:43:00 +08:00
parent 7130cc798c
commit 5917b1eb36
4 changed files with 31 additions and 91 deletions

View File

@@ -348,74 +348,15 @@ namespace API
//close all windows in current thread
void exit()
{
std::vector<basic_window*> v;
internal_scope_guard lock;
restrict::wd_manager().all_handles(v);
if(v.size())
{
std::vector<native_window_type> roots;
native_window_type root = nullptr;
unsigned tid = nana::system::this_thread_id();
for(auto wd : v)
{
if((wd->thread_id == tid) && (wd->root != root))
{
root = wd->root;
bool exists = false;
for (auto i = roots.cbegin(); i != roots.cend(); ++i)
{
if (*i == root)
{
exists = true;
break;
}
}
if (!exists)
roots.emplace_back(root);
}
}
for(auto i : roots)
interface_type::close_window(i);
}
restrict::bedrock.close_thread_window(nana::system::this_thread_id());
}
//close all windows
void exit_all()
{
std::vector<basic_window*> v;
internal_scope_guard lock;
restrict::wd_manager().all_handles(v);
if (v.size())
{
std::vector<native_window_type> roots;
native_window_type root = nullptr;
//unsigned tid = nana::system::this_thread_id();
for (auto wd : v)
{
if (/*(wd->thread_id == tid) &&*/ (wd->root != root))
{
root = wd->root;
bool exists = false;
for (auto i = roots.cbegin(); i != roots.cend(); ++i)
{
if (*i == root)
{
exists = true;
break;
}
}
if (!exists)
roots.emplace_back(root);
}
}
for (auto i : roots)
interface_type::close_window(i);
}
restrict::bedrock.close_thread_window(0);
}
//transform_shortkey_text