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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/nana/gui/place.hpp
View File

@ -10,7 +10,7 @@
* @file: nana/gui/place.cpp * @file: nana/gui/place.cpp
* *
* @contributions: * @contributions:
* min/max and splitter bar initial weight by qPCR4vir. * min/max and splitter bar initial weight by Ariel Vina-Rodriguez.
*/ */
#ifndef NANA_GUI_PLACE_HPP #ifndef NANA_GUI_PLACE_HPP

2
include/nana/gui/widgets/panel.hpp
View File

@ -9,7 +9,7 @@
* *
* @file: nana/gui/widgets/panel.hpp * @file: nana/gui/widgets/panel.hpp
* @author: Jinhao * @author: Jinhao
* @contributors: qPCR4vir * @contributors: Ariel Vina-Rodriguez
* *
* @brief panel is a widget used for placing some widgets. * @brief panel is a widget used for placing some widgets.
*/ */

3
source/gui/detail/win32/bedrock.cpp
View File

@ -8,6 +8,7 @@
* http://www.boost.org/LICENSE_1_0.txt) * http://www.boost.org/LICENSE_1_0.txt)
* *
* @file: nana/gui/detail/win32/bedrock.cpp * @file: nana/gui/detail/win32/bedrock.cpp
* @contributors: Ariel Vina-Rodriguez
*/ */
#include <nana/config.hpp> #include <nana/config.hpp>
@ -1101,7 +1102,7 @@ namespace detail
case WM_MOUSEHWHEEL: case WM_MOUSEHWHEEL:
{ {
//The focus window receives the message in Windows system, it should be redirected to the hovered window //The focus window receives the message in Windows system, it should be redirected to the hovered window
::POINT scr_pos{ pmdec.mouse.x, pmdec.mouse.y}; //Screen position ::POINT scr_pos{ int(LOWORD(lParam)), int(HIWORD(lParam)) }; //Screen position
auto pointer_wd = ::WindowFromPoint(scr_pos); auto pointer_wd = ::WindowFromPoint(scr_pos);
if (pointer_wd == root_window) if (pointer_wd == root_window)
{ {

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

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

2
source/gui/widgets/listbox.cpp
View File

@ -8,7 +8,7 @@
* http://www.boost.org/LICENSE_1_0.txt) * http://www.boost.org/LICENSE_1_0.txt)
* *
* @file: nana/gui/widgets/listbox.cpp * @file: nana/gui/widgets/listbox.cpp
* @contributors: Hiroshi Seki, qPCR4vir * @contributors: Hiroshi Seki, Ariel Vina-Rodriguez
*/ */
#include <nana/gui/widgets/listbox.hpp> #include <nana/gui/widgets/listbox.hpp>

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

@ -8,7 +8,7 @@
* http://www.boost.org/LICENSE_1_0.txt) * http://www.boost.org/LICENSE_1_0.txt)
* *
* @file: nana/gui/widgets/skeletons/text_editor.cpp * @file: nana/gui/widgets/skeletons/text_editor.cpp
* @contributors: qPCR4vir * @contributors: Ariel Vina-Rodriguez
*/ */
#include <nana/gui/widgets/skeletons/text_editor.hpp> #include <nana/gui/widgets/skeletons/text_editor.hpp>
#include <nana/gui/widgets/skeletons/textbase_export_interface.hpp> #include <nana/gui/widgets/skeletons/textbase_export_interface.hpp>