AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add wxDataViewRendererBase::GetEffectiveAlignment() and use it.

Browse Source 
This helper method falls back on the alignment of the column if the renderer
alignment is not specified. This is almost always what should be used instead
of GetAlignment() to determine the alignment that really should be used in the
drawing code.

In particular, using GetEffectiveAlignment() in wxDataViewCustomRenderer fixes
the problem with bitmap columns ignoring column alignment for their bitmaps.

Closes #15498.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2013-09-17 15:25:47 +00:00
parent b59ada676f
commit 3e33568e0b
2 changed files with 52 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/dvrenderers.h
View File

@ -167,6 +167,15 @@ protected:
// Called from {Cancel,Finish}Editing() to cleanup m_editorCtrl
void DestroyEditControl();
// Return the alignment of this renderer if it's specified (i.e. has value
// different from the default wxDVR_DEFAULT_ALIGNMENT) or the alignment of
// the column it is used for otherwise.
//
// Unlike GetAlignment(), this always returns a valid combination of
// wxALIGN_XXX flags (although possibly wxALIGN_NOT) and never returns
// wxDVR_DEFAULT_ALIGNMENT.
int GetEffectiveAlignment() const;
wxString m_variantType;
wxDataViewColumn *m_owner;
wxWeakRef<wxWindow> m_editorCtrl;

82
src/common/datavcmn.cpp
View File

@ -771,6 +771,20 @@ void wxDataViewRendererBase::PrepareForItem(const wxDataViewModel *model,
}
int wxDataViewRendererBase::GetEffectiveAlignment() const
{
int alignment = GetAlignment();
if ( alignment == wxDVR_DEFAULT_ALIGNMENT )
{
// if we don't have an explicit alignment ourselves, use that of the
// column in horizontal direction and default vertical alignment
alignment = GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL;
}
return alignment;
}
// ----------------------------------------------------------------------------
// wxDataViewCustomRendererBase
// ----------------------------------------------------------------------------
@ -807,40 +821,38 @@ wxDataViewCustomRendererBase::WXCallRender(wxRect rectCell, wxDC *dc, int state)
// adjust the rectangle ourselves to account for the alignment
wxRect rectItem = rectCell;
const int align = GetAlignment();
if ( align != wxDVR_DEFAULT_ALIGNMENT )
const int align = GetEffectiveAlignment();
const wxSize size = GetSize();
// take alignment into account only if there is enough space, otherwise
// show as much contents as possible
//
// notice that many existing renderers (e.g. wxDataViewSpinRenderer)
// return hard-coded size which can be more than they need and if we
// trusted their GetSize() we'd draw the text out of cell bounds
// entirely
if ( size.x >= 0 && size.x < rectCell.width )
{
const wxSize size = GetSize();
if ( align & wxALIGN_CENTER_HORIZONTAL )
rectItem.x += (rectCell.width - size.x)/2;
else if ( align & wxALIGN_RIGHT )
rectItem.x += rectCell.width - size.x;
// else: wxALIGN_LEFT is the default
// take alignment into account only if there is enough space, otherwise
// show as much contents as possible
//
// notice that many existing renderers (e.g. wxDataViewSpinRenderer)
// return hard-coded size which can be more than they need and if we
// trusted their GetSize() we'd draw the text out of cell bounds
// entirely
rectItem.width = size.x;
}
if ( size.x >= 0 && size.x < rectCell.width )
{
if ( align & wxALIGN_CENTER_HORIZONTAL )
rectItem.x += (rectCell.width - size.x)/2;
else if ( align & wxALIGN_RIGHT )
rectItem.x += rectCell.width - size.x;
// else: wxALIGN_LEFT is the default
if ( size.y >= 0 && size.y < rectCell.height )
{
if ( align & wxALIGN_CENTER_VERTICAL )
rectItem.y += (rectCell.height - size.y)/2;
else if ( align & wxALIGN_BOTTOM )
rectItem.y += rectCell.height - size.y;
// else: wxALIGN_TOP is the default
rectItem.width = size.x;
}
if ( size.y >= 0 && size.y < rectCell.height )
{
if ( align & wxALIGN_CENTER_VERTICAL )
rectItem.y += (rectCell.height - size.y)/2;
else if ( align & wxALIGN_BOTTOM )
rectItem.y += rectCell.height - size.y;
// else: wxALIGN_TOP is the default
rectItem.height = size.y;
}
rectItem.height = size.y;
}
@ -909,16 +921,8 @@ wxDataViewCustomRendererBase::RenderText(const wxString& text,
}
// get the alignment to use
int align = GetAlignment();
if ( align == wxDVR_DEFAULT_ALIGNMENT )
{
// if we don't have an explicit alignment ourselves, use that of the
// column in horizontal direction and default vertical alignment
align = GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL;
}
dc->DrawLabel(ellipsizedText.empty() ? text : ellipsizedText,
rectText, align);
rectText, GetEffectiveAlignment());
}
//-----------------------------------------------------------------------------