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

update contributor info

Browse Source
This commit is contained in:
Jinhao
2015-04-12 03:31:07 +08:00
parent 2e7b0ebc89
commit ed462870e0
6 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/gui/widgets/label.cpp
View File

@@ -9,7 +9,7 @@
*
* @file: source/gui/widgets/label.cpp
* @author: Jinhao
* @contributors: qPCR4vir
* @contributors: Ariel Vina-Rodriguez
*/
#include <nana/gui/widgets/label.hpp>
@@ -588,7 +588,7 @@ namespace nana
std::pair<std::size_t, std::size_t> _m_locate(dstream::linecontainer::iterator& i, std::size_t pos)
{
std::pair<std::size_t, std::size_t> r;
//std::pair<std::size_t, std::size_t> r; //deprecated
std::size_t n = i->data_ptr->text().length();
while(pos >= n)
@@ -853,24 +853,16 @@ namespace nana
label& label::text_align(align th, align_v tv)
{
internal_scope_guard isg;
internal_scope_guard lock;
auto impl = get_drawer_trigger().impl();
bool to_update = false;
if(impl->text_align != th)
if (th != impl->text_align || tv != impl->text_align_v)
{
impl->text_align = th;
to_update = true;
}
if(impl->text_align_v != tv)
{
impl->text_align_v = tv;
to_update = true;
API::refresh_window(*this);
}
if(to_update)
API::refresh_window(*this);
return *this;
}