Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more corrections to interactive resizing

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-03-17 21:43:26 +00:00
parent ec47a14774
commit b53195fda4
1 changed files with 54 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/univ/topluniv.cpp
View File

@@ -328,13 +328,46 @@ void wxTopLevelWindow::SetIcon(const wxIcon& icon)
// interactive manipulation // interactive manipulation
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static bool wxGetResizingCursor(long hitTestResult, wxCursor& cursor)
{
if ( hitTestResult & wxHT_TOPLEVEL_ANY_BORDER )
{
switch (hitTestResult)
{
case wxHT_TOPLEVEL_BORDER_N:
case wxHT_TOPLEVEL_BORDER_S:
cursor = wxCursor(wxCURSOR_SIZENS);
break;
case wxHT_TOPLEVEL_BORDER_W:
case wxHT_TOPLEVEL_BORDER_E:
cursor = wxCursor(wxCURSOR_SIZEWE);
break;
case wxHT_TOPLEVEL_BORDER_NE:
case wxHT_TOPLEVEL_BORDER_SW:
cursor = wxCursor(wxCURSOR_SIZENESW);
break;
case wxHT_TOPLEVEL_BORDER_NW:
case wxHT_TOPLEVEL_BORDER_SE:
cursor = wxCursor(wxCURSOR_SIZENWSE);
break;
default:
return FALSE;
break;
}
return TRUE;
}
return FALSE;
}
#define wxINTERACTIVE_RESIZE_DIR \ #define wxINTERACTIVE_RESIZE_DIR \
(wxINTERACTIVE_RESIZE_W | wxINTERACTIVE_RESIZE_E | \ (wxINTERACTIVE_RESIZE_W | wxINTERACTIVE_RESIZE_E | \
wxINTERACTIVE_RESIZE_S | wxINTERACTIVE_RESIZE_N) wxINTERACTIVE_RESIZE_S | wxINTERACTIVE_RESIZE_N)
struct wxInteractiveMoveData struct wxInteractiveMoveData
{ {
wxTopLevelWindowBase *m_window; wxTopLevelWindow *m_window;
wxEventLoop *m_evtLoop; wxEventLoop *m_evtLoop;
int m_flags; int m_flags;
wxRect m_rect; wxRect m_rect;
@@ -483,6 +516,7 @@ void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
} }
wxPoint warp; wxPoint warp;
bool changeCur = FALSE;
if ( m_data.m_flags & wxINTERACTIVE_MOVE ) if ( m_data.m_flags & wxINTERACTIVE_MOVE )
{ {
@@ -499,12 +533,14 @@ void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
{ {
m_data.m_flags |= wxINTERACTIVE_RESIZE_N; m_data.m_flags |= wxINTERACTIVE_RESIZE_N;
m_data.m_pos.y = m_data.m_window->GetPosition().y; m_data.m_pos.y = m_data.m_window->GetPosition().y;
changeCur = TRUE;
} }
else if ( diff.y > 0 ) else if ( diff.y > 0 )
{ {
m_data.m_flags |= wxINTERACTIVE_RESIZE_S; m_data.m_flags |= wxINTERACTIVE_RESIZE_S;
m_data.m_pos.y = m_data.m_window->GetPosition().y + m_data.m_pos.y = m_data.m_window->GetPosition().y +
m_data.m_window->GetSize().y; m_data.m_window->GetSize().y;
changeCur = TRUE;
} }
} }
if ( !(m_data.m_flags & if ( !(m_data.m_flags &
@@ -514,12 +550,14 @@ void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
{ {
m_data.m_flags |= wxINTERACTIVE_RESIZE_W; m_data.m_flags |= wxINTERACTIVE_RESIZE_W;
m_data.m_pos.x = m_data.m_window->GetPosition().x; m_data.m_pos.x = m_data.m_window->GetPosition().x;
changeCur = TRUE;
} }
else if ( diff.x > 0 ) else if ( diff.x > 0 )
{ {
m_data.m_flags |= wxINTERACTIVE_RESIZE_E; m_data.m_flags |= wxINTERACTIVE_RESIZE_E;
m_data.m_pos.x = m_data.m_window->GetPosition().x + m_data.m_pos.x = m_data.m_window->GetPosition().x +
m_data.m_window->GetSize().x; m_data.m_window->GetSize().x;
changeCur = TRUE;
} }
} }
@@ -543,6 +581,19 @@ void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
warp -= m_data.m_window->GetClientAreaOrigin(); warp -= m_data.m_window->GetClientAreaOrigin();
m_data.m_window->WarpPointer(warp.x, warp.y); m_data.m_window->WarpPointer(warp.x, warp.y);
if ( changeCur )
{
long hit = m_data.m_window->HitTest(warp);
wxCursor cur;
if ( wxGetResizingCursor(hit, cur) )
{
if ( m_data.m_sizingCursor )
wxEndBusyCursor();
wxBeginBusyCursor(&cur);
m_data.m_sizingCursor = TRUE;
}
}
} }
} }
@@ -848,31 +899,9 @@ bool wxStdFrameInputHandler::HandleMouseMove(wxInputConsumer *consumer,
if ( hit & wxHT_TOPLEVEL_ANY_BORDER ) if ( hit & wxHT_TOPLEVEL_ANY_BORDER )
{ {
m_borderCursorOn = TRUE;
wxCursor cur; wxCursor cur;
switch (hit) m_borderCursorOn = wxGetResizingCursor(hit, cur);
{
case wxHT_TOPLEVEL_BORDER_N:
case wxHT_TOPLEVEL_BORDER_S:
cur = wxCursor(wxCURSOR_SIZENS);
break;
case wxHT_TOPLEVEL_BORDER_W:
case wxHT_TOPLEVEL_BORDER_E:
cur = wxCursor(wxCURSOR_SIZEWE);
break;
case wxHT_TOPLEVEL_BORDER_NE:
case wxHT_TOPLEVEL_BORDER_SW:
cur = wxCursor(wxCURSOR_SIZENESW);
break;
case wxHT_TOPLEVEL_BORDER_NW:
case wxHT_TOPLEVEL_BORDER_SE:
cur = wxCursor(wxCURSOR_SIZENWSE);
break;
default:
m_borderCursorOn = FALSE;
break;
}
if ( m_borderCursorOn ) if ( m_borderCursorOn )
{ {
m_origCursor = win->GetCursor(); m_origCursor = win->GetCursor();