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

moved wxScrollBar geometry methods out of wxRenderer, they are common for all themes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-10-30 12:33:25 +00:00
parent 6236b8b477
commit 561955046e
8 changed files with 299 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/univ/themes/win32.cpp
View File

@@ -3229,13 +3229,11 @@ bool wxWin32ScrollBarInputHandler::OnScrollTimer(wxScrollBar *scrollbar,
bool stop = false;
if ( action == wxACTION_SCROLL_PAGE_DOWN )
{
stop = m_renderer->HitTestScrollbar(scrollbar, m_ptStartScrolling)
!= wxHT_SCROLLBAR_BAR_2;
stop = scrollbar->HitTestBar(m_ptStartScrolling) != wxHT_SCROLLBAR_BAR_2;
}
else if ( action == wxACTION_SCROLL_PAGE_UP )
{
stop = m_renderer->HitTestScrollbar(scrollbar, m_ptStartScrolling)
!= wxHT_SCROLLBAR_BAR_1;
stop = scrollbar->HitTestBar(m_ptStartScrolling) != wxHT_SCROLLBAR_BAR_1;
}
if ( stop )
@@ -3297,7 +3295,7 @@ bool wxWin32ScrollBarInputHandler::HandleMouseMove(wxInputConsumer *control,
return false;
}
ht = m_renderer->HitTestScrollbar(scrollbar, event.GetPosition());
ht = scrollbar->HitTestBar(event.GetPosition());
if ( ht == m_htLast )
{
// yes it did, resume scrolling
@@ -3327,7 +3325,7 @@ bool wxWin32ScrollBarInputHandler::HandleMouseMove(wxInputConsumer *control,
// Always let thumb jump back if we leave the scrollbar
if ( event.Moving() )
{
ht = m_renderer->HitTestScrollbar(scrollbar, event.GetPosition());
ht = scrollbar->HitTestBar(event.GetPosition());
}
else // event.Leaving()
{
@@ -3346,7 +3344,7 @@ bool wxWin32ScrollBarInputHandler::HandleMouseMove(wxInputConsumer *control,
if (pos.y > -40 && pos.y < scrollbar->GetSize().y+40)
pos.y = 5;
}
ht = m_renderer->HitTestScrollbar(scrollbar, pos );
ht = scrollbar->HitTestBar(pos);
#endif
// if we're dragging the thumb and the mouse stays in the scrollbar, it