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

small fixes

Browse Source
This commit is contained in:
Jinhao 2016-05-22 04:46:07 +08:00
parent a0a1f01097
commit a1b552439d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/gui/detail/bedrock_posix.cpp
View File

@ -515,7 +515,7 @@ namespace detail
if(msgwnd) if(msgwnd)
{ {
if (mouse_action::pressed != msgwnd->flags.action) if (mouse_action::pressed != msgwnd->flags.action)
msgwnd->set_action(mouse_action::over); msgwnd->set_action(mouse_action::hovered);
hovered_wd = msgwnd; hovered_wd = msgwnd;
@ -669,7 +669,7 @@ namespace detail
{ {
if((arg.button == ::nana::mouse::left_button) && hit) if((arg.button == ::nana::mouse::left_button) && hit)
{ {
msgwnd->set_action(mouse_action::over); msgwnd->set_action(mouse_action::hovered);
click_arg.window_handle = reinterpret_cast<window>(msgwnd); click_arg.window_handle = reinterpret_cast<window>(msgwnd);
draw_invoker(&drawer::click, msgwnd, click_arg, &context); draw_invoker(&drawer::click, msgwnd, click_arg, &context);
@ -680,7 +680,7 @@ namespace detail
if(wd_manager.available(msgwnd) && msgwnd->flags.enabled) if(wd_manager.available(msgwnd) && msgwnd->flags.enabled)
{ {
if(hit) if(hit)
msgwnd->set_action(mouse_action::over); msgwnd->set_action(mouse_action::hovered);
auto retain = msgwnd->together.events_ptr; auto retain = msgwnd->together.events_ptr;
auto evt_ptr = retain.get(); auto evt_ptr = retain.get();
@ -766,7 +766,7 @@ namespace detail
{ {
evt_code = event_code::mouse_enter; evt_code = event_code::mouse_enter;
if (mouse_action::pressed != msgwnd->flags.action) if (mouse_action::pressed != msgwnd->flags.action)
msgwnd->set_action(mouse_action::over); msgwnd->set_action(mouse_action::hovered);
} }
arg_mouse arg; arg_mouse arg;
assign_arg(arg, msgwnd, message, xevent); assign_arg(arg, msgwnd, message, xevent);
@ -781,7 +781,7 @@ namespace detail
assign_arg(arg, msgwnd, message, xevent); assign_arg(arg, msgwnd, message, xevent);
if (mouse_action::pressed != msgwnd->flags.action) if (mouse_action::pressed != msgwnd->flags.action)
msgwnd->set_action(mouse_action::over); msgwnd->set_action(mouse_action::hovered);
if (hovered_wd != msgwnd) if (hovered_wd != msgwnd)
{ {