implemented wxTLW::InteractiveMove and mostly finished wxTLW/Univ
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -3153,7 +3153,7 @@ int wxWin32Renderer::HitTestFrame(const wxRect& rect, const wxPoint& pt, int fla
|
||||
btnRect.x -= FRAME_BUTTON_WIDTH;
|
||||
}
|
||||
|
||||
if ( pt.y < client.y + FRAME_TITLEBAR_HEIGHT )
|
||||
if ( pt.y >= client.y && pt.y < client.y + FRAME_TITLEBAR_HEIGHT )
|
||||
return wxHT_TOPLEVEL_TITLEBAR;
|
||||
}
|
||||
|
||||
@@ -3161,17 +3161,15 @@ int wxWin32Renderer::HitTestFrame(const wxRect& rect, const wxPoint& pt, int fla
|
||||
{
|
||||
// we are certainly at one of borders, lets decide which one:
|
||||
|
||||
wxCoord midX = client.x + client.width/2,
|
||||
midY = client.y + client.height/2;
|
||||
int border = 0;
|
||||
// dirty trick, relies on the way wxHT_TOPLEVEL_XXX are defined!
|
||||
if ( pt.x < midX )
|
||||
if ( pt.x < client.x )
|
||||
border |= wxHT_TOPLEVEL_BORDER_W;
|
||||
else
|
||||
else if ( pt.x >= client.width + client.x )
|
||||
border |= wxHT_TOPLEVEL_BORDER_E;
|
||||
if ( pt.y < midY )
|
||||
if ( pt.y < client.y )
|
||||
border |= wxHT_TOPLEVEL_BORDER_N;
|
||||
else
|
||||
else if ( pt.y >= client.height + client.y )
|
||||
border |= wxHT_TOPLEVEL_BORDER_S;
|
||||
return border;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user