Fix wxELLIPSIZE_END with wxALIGN_RIGHT in wxMSW wxDataViewCtrl
Using wxELLIPSIZE_END together with wxALIGN_RIGHT resulted in unnecessarily
ellipsizing or truncating the column contents in generic wxDataViewCtrl under
MSW due to the combination of b642747fd2
and
the native API behaviour.
Fix this by not using alignment in RenderText(): it is unnecessary anyhow and
not doing it avoids the problem as a side effect.
Closes #17363.
This commit is contained in:
parent
db6e1c5b38
commit
e2e7d3d391
@ -1002,12 +1002,17 @@ wxDataViewCustomRendererBase::RenderText(const wxString& text,
|
||||
if ( !GetOwner()->GetOwner()->IsEnabled() )
|
||||
flags |= wxCONTROL_DISABLED;
|
||||
|
||||
// Notice that we intentionally don't use any alignment here: it is not
|
||||
// necessary because the cell rectangle had been already adjusted to
|
||||
// account for the alignment in WXCallRender() and using the alignment here
|
||||
// results in problems with ellipsization when using native MSW renderer,
|
||||
// see http://trac.wxwidgets.org/ticket/17363, so just don't do it.
|
||||
wxRendererNative::Get().DrawItemText(
|
||||
GetOwner()->GetOwner(),
|
||||
*dc,
|
||||
text,
|
||||
rectText,
|
||||
GetEffectiveAlignment(),
|
||||
wxALIGN_NOT,
|
||||
flags,
|
||||
GetEllipsizeMode());
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user