Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Interface Kit: read reply before calling hooks.

Browse Source 
Part of #15548.

Change-Id: I074d36717ef1e2fad4e8bc215448fa72f797ed7f
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2099
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
This commit is contained in:
X512 2020-01-11 04:29:17 +09:00 committed by waddlesplash
parent f6779f3d47
commit db7c4791bb
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/kits/interface/Window.cpp
View File

@ -1187,23 +1187,6 @@ FrameMoved(origin);
float height;
fLink->Read<float>(&width);
fLink->Read<float>(&height);
if (origin != fFrame.LeftTop()) {
// TODO: remove code duplicatation with
// B_WINDOW_MOVED case...
//printf("window position was not up to date\n");
fFrame.OffsetTo(origin);
FrameMoved(origin);
}
if (width != fFrame.Width() || height != fFrame.Height()) {
// TODO: remove code duplicatation with
// B_WINDOW_RESIZED case...
//printf("window size was not up to date\n");
fFrame.right = fFrame.left + width;
fFrame.bottom = fFrame.top + height;
_AdoptResize();
FrameResized(width, height);
}
// read tokens for views that need to be drawn
// NOTE: we need to read the tokens completely
@ -1232,6 +1215,26 @@ FrameMoved(origin);
if (error < B_OK)
break;
}
// Hooks should be called after finishing reading reply because
// they can access fLink.
if (origin != fFrame.LeftTop()) {
// TODO: remove code duplicatation with
// B_WINDOW_MOVED case...
//printf("window position was not up to date\n");
fFrame.OffsetTo(origin);
FrameMoved(origin);
}
if (width != fFrame.Width() || height != fFrame.Height()) {
// TODO: remove code duplicatation with
// B_WINDOW_RESIZED case...
//printf("window size was not up to date\n");
fFrame.right = fFrame.left + width;
fFrame.bottom = fFrame.top + height;
_AdoptResize();
FrameResized(width, height);
}
// draw
int32 count = infos.CountItems();
for (int32 i = 0; i < count; i++) {