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

Fix display of right aligned columns in wxGenericListCtrl.

Browse Source 
Take into account the width of the image when drawing the right aligned item
in wxGenericListCtrl.

Closes #12562.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2010-10-13 22:10:45 +00:00
parent 71d6cd60ee
commit cff48ba847
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -415,6 +415,7 @@ All (GUI):
- Add support for CP-866 encoding to wxEncodingConverter (madnut). - Add support for CP-866 encoding to wxEncodingConverter (madnut).
- Consistency fixes for keyboard events across all major ports. - Consistency fixes for keyboard events across all major ports.
- Added EVT_RIBBONBAR_TAB_LEFT_DCLICK event (snowleopard). - Added EVT_RIBBONBAR_TAB_LEFT_DCLICK event (snowleopard).
- Fix display of right aligned columns in wxGenericListCtrl (jl).
MSW: MSW:

5
src/generic/listctrl.cpp
View File

@ -804,7 +804,8 @@ void wxListLineData::DrawInReportMode( wxDC *dc,
int xOld = x; int xOld = x;
x += width; x += width;
const int wText = width - 8; width -= 8;
const int wText = width;
wxDCClipper clipper(*dc, xOld, rect.y, wText, rect.height); wxDCClipper clipper(*dc, xOld, rect.y, wText, rect.height);
if ( item->HasImage() ) if ( item->HasImage() )
@ -820,7 +821,7 @@ void wxListLineData::DrawInReportMode( wxDC *dc,
} }
if ( item->HasText() ) if ( item->HasText() )
DrawTextFormatted(dc, item->GetText(), col, xOld, yMid, wText); DrawTextFormatted(dc, item->GetText(), col, xOld, yMid, width);
} }
} }