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

offset the text correctly inside the item rect in DrawItem(), it was off by 1

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-09-30 18:32:33 +00:00
parent b19d4eb9bf
commit 746146e0e3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/univ/stdrend.cpp
View File

@@ -42,6 +42,9 @@ static const int FRAME_TITLEBAR_HEIGHT = 18;
static const int FRAME_BUTTON_WIDTH = 16; static const int FRAME_BUTTON_WIDTH = 16;
static const int FRAME_BUTTON_HEIGHT = 14; static const int FRAME_BUTTON_HEIGHT = 14;
// the margin between listbox item text and its rectangle
static const int ITEM_MARGIN = 1;
// ============================================================================ // ============================================================================
// wxStdRenderer implementation // wxStdRenderer implementation
// ============================================================================ // ============================================================================
@@ -483,7 +486,7 @@ bool wxStdRenderer::AreScrollbarsInsideBorder() const
wxCoord wxStdRenderer::GetListboxItemHeight(wxCoord fontHeight) wxCoord wxStdRenderer::GetListboxItemHeight(wxCoord fontHeight)
{ {
return fontHeight + 2; return fontHeight + 2*ITEM_MARGIN;
} }
void wxStdRenderer::DrawTextBorder(wxDC& dc, void wxStdRenderer::DrawTextBorder(wxDC& dc,
@@ -609,9 +612,9 @@ void wxStdRenderer::DrawItem(wxDC& dc,
dc.DrawRectangle(rect); dc.DrawRectangle(rect);
} }
// horizontal adjustment is arbitrary
wxRect rectText = rect; wxRect rectText = rect;
rectText.x += 2; rectText.Deflate(2, ITEM_MARGIN);
rectText.width -= 2;
dc.DrawLabel(label, wxNullBitmap, rectText); dc.DrawLabel(label, wxNullBitmap, rectText);
if ( flags & wxCONTROL_FOCUSED ) if ( flags & wxCONTROL_FOCUSED )