ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 04:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Use smaller font for captions and status bar.

Browse Source 
- Return more accurate font height in TextIntGetTextExtentPoint.

svn path=/trunk/; revision=7290
This commit is contained in:
Filip Navara
2003-12-28 14:14:04 +00:00
parent 1ff3a7da81
commit 39ed4e8db9
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/subsys/win32k/ntuser/misc.c
+3 -5
View File
@@ -1,4 +1,4 @@
/* $Id: misc.c,v 1.41 2003/12/26 00:58:33 weiden Exp $
/* $Id: misc.c,v 1.42 2003/12/28 14:14:03 navaraf Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -386,10 +386,8 @@ NtUserSystemParametersInfo(
static BOOL GradientCaptions = TRUE;
/* FIXME: This should be obtained from the registry */
static LOGFONTW CaptionFont =
{ 14, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,
0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"" };
/* { 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, OEM_CHARSET,
0, 0, DEFAULT_QUALITY, FF_MODERN, L"Bitstream Vera Sans Bold" };*/
{ 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,
0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"" };
NTSTATUS Status;
PWINSTATION_OBJECT WinStaObject;
reactos/subsys/win32k/objects/text.c
+6 -4
View File
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id: text.c,v 1.68 2003/12/26 10:43:08 gvg Exp $ */
/* $Id: text.c,v 1.69 2003/12/28 14:14:04 navaraf Exp $ */
#undef WIN32_LEAN_AND_MEAN
@@ -1019,7 +1019,8 @@ NtGdiGetTextCharsetInfo(HDC hDC,
static BOOL
FASTCALL
TextIntGetTextExtentPoint(PTEXTOBJ TextObj,
TextIntGetTextExtentPoint(HDC hDC,
PTEXTOBJ TextObj,
LPCWSTR String,
int Count,
int MaxExtent,
@@ -1137,6 +1138,7 @@ TextIntGetTextExtentPoint(PTEXTOBJ TextObj,
Size->cx = TotalWidth;
Size->cy = (TextObj->logfont.lfHeight < 0 ? - TextObj->logfont.lfHeight : TextObj->logfont.lfHeight);
Size->cy = EngMulDiv(Size->cy, NtGdiGetDeviceCaps(hDC, LOGPIXELSY), 72);
return TRUE;
}
@@ -1225,7 +1227,7 @@ NtGdiGetTextExtentExPoint(HDC hDC,
}
TextObj = TEXTOBJ_LockText(dc->w.hFont);
DC_UnlockDc(hDC);
Result = TextIntGetTextExtentPoint(TextObj, String, Count, MaxExtent,
Result = TextIntGetTextExtentPoint(hDC, TextObj, String, Count, MaxExtent,
NULL == UnsafeFit ? NULL : &Fit, Dx, &Size);
TEXTOBJ_UnlockText(dc->w.hFont);
@@ -1348,7 +1350,7 @@ NtGdiGetTextExtentPoint32(HDC hDC,
TextObj = TEXTOBJ_LockText(dc->w.hFont);
DC_UnlockDc(hDC);
Result = TextIntGetTextExtentPoint (
TextObj, String, Count, 0, NULL, NULL, &Size);
hDC, TextObj, String, Count, 0, NULL, NULL, &Size);
dc = DC_LockDc(hDC);
ASSERT(dc); // it succeeded earlier, it should now, too
TEXTOBJ_UnlockText(dc->w.hFont);