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

fix static box label drawing in RTL locale (patch 1552545)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-09-10 23:39:37 +00:00
parent cec5ffc46d
commit cf072997af
1 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/msw/statbox.cpp
View File

@@ -120,6 +120,9 @@ bool wxStaticBox::Create(wxWindow *parent,
if ( !MSWCreateControl(wxT("BUTTON"), label, pos, size) ) if ( !MSWCreateControl(wxT("BUTTON"), label, pos, size) )
return false; return false;
// Always use LTR layout. Otherwise, the label would be mirrored.
SetLayoutDirection(wxLayout_LeftToRight);
#ifndef __WXWINCE__ #ifndef __WXWINCE__
if (!wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint"))) if (!wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint")))
Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBox::OnPaint)); Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBox::OnPaint));
@@ -151,7 +154,15 @@ WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
*exstyle = 0; *exstyle = 0;
} }
return styleWin | BS_GROUPBOX; styleWin |= BS_GROUPBOX;
if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
{
// Make sure label is on the right
styleWin |= BS_RIGHT;
}
return styleWin;
} }
wxSize wxStaticBox::DoGetBestSize() const wxSize wxStaticBox::DoGetBestSize() const
@@ -364,7 +375,7 @@ void wxStaticBox::PaintBackground(wxDC& dc, const RECT& rc)
::FillRect(GetHdcOf(dc), &rc, hbr); ::FillRect(GetHdcOf(dc), &rc, hbr);
} }
void wxStaticBox::PaintForeground(wxDC& dc, const RECT& WXUNUSED(rc)) void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
{ {
MSWDefWindowProc(WM_PAINT, (WPARAM)GetHdcOf(dc), 0); MSWDefWindowProc(WM_PAINT, (WPARAM)GetHdcOf(dc), 0);
@@ -406,27 +417,53 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& WXUNUSED(rc))
// FIXME: value of x is hardcoded as this is what it is on my system, // FIXME: value of x is hardcoded as this is what it is on my system,
// no idea if it's true everywhere // no idea if it's true everywhere
// TODO: RTL?
const int x = 9; const bool rtl = wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft;
const int y = dc.GetCharHeight(); if ( rtl )
::SetTextAlign(hdc, TA_RTLREADING | TA_RIGHT);
// Get dimensions of the label
const wxString label = GetLabel(); const wxString label = GetLabel();
int width, height;
dc.GetTextExtent(wxStripMenuCodes(label, wxStrip_Mnemonics), &width, &height);
int x;
int y = height;
// first we need to correctly paint the background of the label // first we need to correctly paint the background of the label
// as Windows ignores the brush offset when doing it // as Windows ignores the brush offset when doing it
RECT rc = { x, 0, GetSize().x, y }; RECT dimensions = {0, 0, 0, y};
::DrawText(hdc, label, label.length(), &rc, if ( !rtl )
DT_SINGLELINE | DT_VCENTER | DT_CALCRECT); {
x = 9;
dimensions.left = x;
dimensions.right = x + width;
}
else
{
x = rc.right - 7;
dimensions.left = x - width;
dimensions.right = x;
}
// need to adjust the rectangle to cover all the label background // need to adjust the rectangle to cover all the label background
rc.left -= 2; dimensions.left -= 2;
rc.right += 2; dimensions.right += 2;
rc.bottom += 2; dimensions.bottom += 2;
PaintBackground(dc, rc); PaintBackground(dc, dimensions);
// now draw the text // now draw the text
RECT rc2 = { x, 0, GetSize().x, y }; if ( !rtl )
::DrawText(hdc, label, label.length(), &rc2, {
DT_SINGLELINE | DT_VCENTER); ::DrawText(hdc, label, label.length(), &dimensions,
DT_SINGLELINE | DT_VCENTER);
}
else // RTL
{
RECT rc2 = { x, 0, x - width, y };
::DrawText(hdc, label, label.length(), &rc2,
DT_SINGLELINE | DT_VCENTER | DT_RTLREADING);
}
} }
} }