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

Applied patch [ 1405821 ] wxVListBox double-buffering + fix to a scrolling issue

Browse Source 
By Jaakko Salli


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2006-01-17 16:00:43 +00:00
parent 2fb0cabbf9
commit 0975a8a065
1 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/generic/vlbox.cpp
View File

@ -32,6 +32,7 @@
#endif //WX_PRECOMP #endif //WX_PRECOMP
#include "wx/vlbox.h" #include "wx/vlbox.h"
#include "wx/dcbuffer.h"
#include "wx/selstore.h" #include "wx/selstore.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -61,6 +62,7 @@ void wxVListBox::Init()
m_current = m_current =
m_anchor = wxNOT_FOUND; m_anchor = wxNOT_FOUND;
m_selStore = NULL; m_selStore = NULL;
m_doubleBuffer = NULL;
} }
bool wxVListBox::Create(wxWindow *parent, bool wxVListBox::Create(wxWindow *parent,
@ -82,11 +84,15 @@ bool wxVListBox::Create(wxWindow *parent,
SetBackgroundColour(GetBackgroundColour()); SetBackgroundColour(GetBackgroundColour());
m_colBgSel = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); m_colBgSel = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
// flicker-free drawing requires this
SetBackgroundStyle(wxBG_STYLE_CUSTOM);
return true; return true;
} }
wxVListBox::~wxVListBox() wxVListBox::~wxVListBox()
{ {
delete m_doubleBuffer;
delete m_selStore; delete m_selStore;
} }
@ -224,10 +230,8 @@ bool wxVListBox::DoSetCurrent(int current)
{ {
// it is, indeed, only partly visible, so scroll it into view to // it is, indeed, only partly visible, so scroll it into view to
// make it entirely visible // make it entirely visible
if ( (size_t)m_current == GetLastVisibleLine() ) while ( (size_t)m_current == GetLastVisibleLine() &&
{ ScrollToLine(GetVisibleBegin()+1) );
ScrollToLine(m_current);
}
// but in any case refresh it as even if it was only partly visible // but in any case refresh it as even if it was only partly visible
// before we need to redraw it entirely as its background changed // before we need to redraw it entirely as its background changed
@ -351,14 +355,29 @@ void wxVListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const
void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event)) void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event))
{ {
wxPaintDC dc(this); // If size is larger, recalculate double buffer bitmap
wxSize clientSize = GetClientSize();
if ( !m_doubleBuffer ||
clientSize.x > m_doubleBuffer->GetWidth() ||
clientSize.y > m_doubleBuffer->GetHeight() )
{
delete m_doubleBuffer;
m_doubleBuffer = new wxBitmap(clientSize.x+25,clientSize.y+25);
}
wxBufferedPaintDC dc(this,*m_doubleBuffer);
// the update rectangle // the update rectangle
wxRect rectUpdate = GetUpdateClientRect(); wxRect rectUpdate = GetUpdateClientRect();
// Fill it with background colour
dc.SetBrush(GetBackgroundColour());
dc.Clear();
// the bounding rectangle of the current line // the bounding rectangle of the current line
wxRect rectLine; wxRect rectLine;
rectLine.width = GetClientSize().x; rectLine.width = clientSize.x;
// iterate over all visible lines // iterate over all visible lines
const size_t lineMax = GetLastVisibleLine(); const size_t lineMax = GetLastVisibleLine();
@ -603,6 +622,11 @@ void wxVListBox::OnLeftDClick(wxMouseEvent& eventMouse)
{ {
int item = HitTest(eventMouse.GetPosition()); int item = HitTest(eventMouse.GetPosition());
if ( item != wxNOT_FOUND ) if ( item != wxNOT_FOUND )
{
// if item double-clicked was not yet selected, then treat
// this event as a left-click instead
if ( item == m_current )
{ {
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, GetId()); wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, GetId());
event.SetEventObject(this); event.SetEventObject(this);
@ -610,6 +634,12 @@ void wxVListBox::OnLeftDClick(wxMouseEvent& eventMouse)
(void)GetEventHandler()->ProcessEvent(event); (void)GetEventHandler()->ProcessEvent(event);
} }
else
{
OnLeftDown(eventMouse);
}
}
} }