- Select ANSI_VAR_FONT in explorer when drawing start button text and desktop switching buttons text. Based on Juriy Sidorov's patch from bug 3484.

See issue #3484 for more details.

svn path=/trunk/; revision=36303
This commit is contained in:
Aleksey Bragin 2008-09-18 12:56:52 +00:00
parent a0d50db01e
commit c6afd96ea2
2 changed files with 3 additions and 0 deletions

View file

@ -93,6 +93,7 @@ LRESULT DesktopBar::Init(LPCREATESTRUCT pcs)
// create start button
ResString start_str(IDS_START);
WindowCanvas canvas(_hwnd);
FontSelection font(canvas, GetStockFont(ANSI_VAR_FONT));
RECT rect = {0, 0};
DrawText(canvas, start_str, -1, &rect, DT_SINGLELINE|DT_CALCRECT);
int start_btn_width = rect.right+16+8;
@ -101,6 +102,7 @@ LRESULT DesktopBar::Init(LPCREATESTRUCT pcs)
// create "Start" button
HWND hwndStart = Button(_hwnd, start_str, 1, 1, start_btn_width, REBARBAND_HEIGHT, IDC_START, WS_VISIBLE|WS_CHILD|BS_OWNERDRAW);
SetWindowFont(hwndStart, GetStockFont(ANSI_VAR_FONT), FALSE);
new StartButton(hwndStart);
/* Save the handle to the window, needed for push-state handling */

View file

@ -141,6 +141,7 @@ void QuickLaunchBar::AddShortcuts()
HBITMAP hbmp = CreateCompatibleBitmap(canvas, cx, cy);
HBITMAP hbmp_old = SelectBitmap(hdc, hbmp);
FontSelection font(hdc, GetStockFont(ANSI_VAR_FONT));
FmtString num_txt(TEXT("%d"), i+1);
TextColor color(hdc, RGB(64,64,64));
BkMode mode(hdc, TRANSPARENT);