mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improve text_editor set_accept

Browse Source
This commit is contained in:
Jinhao 2017-02-17 07:17:47 +08:00
parent 2829a6c2de
commit 1d31809051
3 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nana/system/dataexch.hpp
View File

@ -1,6 +1,6 @@
/*
* Data Exchanger Implementation
* Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
* Copyright(C) 2003-2017 Jinhao(cnjinhao@hotmail.com)
*
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
@ -38,6 +38,8 @@ namespace system{
void get(std::string& text_utf8);
void get(std::wstring& text);
std::wstring wget();
private:
bool _m_set(format, const void* buf, std::size_t size, native_window_type);
void* _m_get(format, size_t& size);

27
source/gui/widgets/skeletons/text_editor.cpp
View File

@ -1,7 +1,7 @@
/*
* A text editor implementation
* Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2016 Jinhao(cnjinhao@hotmail.com)
* Copyright(C) 2003-2017 Jinhao(cnjinhao@hotmail.com)
*
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
@ -2344,26 +2344,31 @@ namespace nana{ namespace widgets
void text_editor::paste()
{
std::wstring text;
nana::system::dataexch().get(text);
auto text = system::dataexch{}.wget();
//If it is required check the acceptable
if (accepts::no_restrict != impl_->capacities.acceptive)
if ((accepts::no_restrict != impl_->capacities.acceptive) || impl_->capacities.pred_acceptive)
{
for (auto i = text.begin(); i != text.end(); ++i)
{
if (!_m_accepts(*i))
if (_m_accepts(*i))
{
if (accepts::no_restrict == impl_->capacities.acceptive)
put(*i);
continue;
}
if (accepts::no_restrict != impl_->capacities.acceptive)
{
text.erase(i, text.end());
put(std::move(text));
}
break;
}
}
}
if (!text.empty())
put(std::move(text));
}
void text_editor::enter(bool record_undo)
{
if(false == attributes_.multi_lines)
@ -2815,7 +2820,11 @@ namespace nana{ namespace widgets
bool text_editor::_m_accepts(char_type ch) const
{
if (accepts::no_restrict == impl_->capacities.acceptive)
{
if (impl_->capacities.pred_acceptive)
return impl_->capacities.pred_acceptive(ch);
return true;
}
//Checks the input whether it meets the requirement for a numeric.
auto str = text();

10
source/system/dataexch.cpp
View File

@ -1,6 +1,6 @@
/*
* Data Exchanger Implementation
* Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
* Copyright(C) 2003-2017 Jinhao(cnjinhao@hotmail.com)
*
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
@ -183,6 +183,14 @@ namespace nana{ namespace system{
#endif
}
}
std::wstring dataexch::wget()
{
std::wstring str;
this->get(str);
return str;
}
//private:
bool dataexch::_m_set(format fmt, const void* buf, std::size_t size, native_window_type owner)
{