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

fix bug that window_position returns the pos of WM reparenting frame

Browse Source
This commit is contained in:
Jinhao
2018-08-01 07:31:02 +08:00
parent df5fda9096
commit 1339658c4c
7 changed files with 97 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/gui/detail/native_window_interface.cpp
View File

@@ -296,6 +296,8 @@ namespace nana{
win_attr.save_under = True;
attr_mask |= CWSaveUnder;
///The parameter of XCreateWindow to create a top level window must be root.
///But after creation, the real parent is the reparenting frame window.
parent = restrict::spec.root_window();
calc_screen_point(owner, pos);
}
@@ -309,9 +311,10 @@ namespace nana{
if(handle)
{
//make owner if it is a popup window
if((!nested) && owner)
if(!nested)
{
restrict::spec.make_owner(owner, reinterpret_cast<native_window_type>(handle));
auto origin_owner = (owner ? owner : reinterpret_cast<native_window_type>(restrict::spec.root_window()));
restrict::spec.make_owner(origin_owner, reinterpret_cast<native_window_type>(handle));
exposed_positions[handle] = pos;
}
@@ -1222,7 +1225,7 @@ namespace nana{
Window drop_wd;
int x, y;
unsigned mask;
nana::detail::platform_scope_guard psg;
nana::detail::platform_scope_guard lock;
::XQueryPointer(restrict::spec.open_display(), restrict::spec.root_window(), &drop_wd, &drop_wd, &pos.x, &pos.y, &x, &y, &mask);
return pos;
#endif
@@ -1278,9 +1281,19 @@ namespace nana{
if(returns_previous)
prev = parent_window(child);
if(native_window_type{} == new_parent)
new_parent = reinterpret_cast<native_window_type>(restrict::spec.root_window());
::XReparentWindow(restrict::spec.open_display(),
reinterpret_cast<Window>(child), reinterpret_cast<Window>(new_parent),
0, 0);
// If umake_owner returns true, it indicates the child windows is a popup window.
// So make the ownership of new_parent and child.
if(restrict::spec.umake_owner(child))
restrict::spec.make_owner(new_parent, child);
return prev;
#endif
}

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

@@ -99,7 +99,7 @@ namespace nana
//Check scroll_area to avoiding division by zero.
if (scroll_area)
metrics_.value = pos * (static_cast<double>(value_max) / scroll_area); //converting to double to avoid overflow.
metrics_.value = static_cast<std::size_t>(pos * (static_cast<double>(value_max) / scroll_area)); //converting to double to avoid overflow.
if (metrics_.value < value_max)
{

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

@@ -1853,7 +1853,6 @@ namespace nana
item_locator nl(impl_, xpos, arg.pos.x, arg.pos.y);
impl_->attr.tree_cont.for_each<item_locator&>(shape.first, nl);
auto & node_state = impl_->node_state;
node_state.pressed_node = nl.node();
@@ -1869,7 +1868,6 @@ namespace nana
else
return;
impl_->draw(true);
API::dev::lazy_refresh();
}