mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-15 09:47:20 +00:00
nsfont.m (nsfont_open): remove unused variable shrink. Remove commented-out code.
This commit is contained in:
parent
b892d3c9b2
commit
7fa87f63b4
17
src/nsfont.m
17
src/nsfont.m
@ -630,7 +630,7 @@ avoid creating multiple struct font objects (with metrics cache, etc.)
|
||||
font->props[FONT_FILE_INDEX] = Qnil;
|
||||
|
||||
{
|
||||
double expand, shrink, hshrink;
|
||||
double expand, hshrink;
|
||||
float full_height, min_height, hd;
|
||||
const char *fontName = [[nsfont fontName] UTF8String];
|
||||
int len = strlen (fontName);
|
||||
@ -660,21 +660,9 @@ avoid creating multiple struct font objects (with metrics cache, etc.)
|
||||
hd = full_height - min_height;
|
||||
|
||||
/* standard height, similar to Carbon. Emacs.app: was 0.5 by default. */
|
||||
expand = 0.0;
|
||||
shrink = 1.0;
|
||||
expand = 0.0;
|
||||
hshrink = 1.0;
|
||||
|
||||
/*
|
||||
if (expand < 0.0)
|
||||
{
|
||||
shrink = 1 + expand;
|
||||
hshrink = 1 + expand / 2.0;
|
||||
expand = 0.0;
|
||||
}
|
||||
else
|
||||
shrink = hshrink = 1.0;
|
||||
*/
|
||||
|
||||
font_info->underpos = 2; /*[sfont underlinePosition] is often clipped out */
|
||||
font_info->underwidth = [sfont underlineThickness];
|
||||
font_info->size = font->pixel_size;
|
||||
@ -691,7 +679,6 @@ avoid creating multiple struct font objects (with metrics cache, etc.)
|
||||
font_info->max_bounds.lbearing = lrint (brect.origin.x);
|
||||
font_info->max_bounds.rbearing =
|
||||
lrint (brect.size.width - font_info->width);
|
||||
/*font_info->width + (font_info->ital ? 0.2 * font_info->height : 0); */
|
||||
|
||||
#ifdef NS_IMPL_COCOA
|
||||
/* set up synthItal and the CG font */
|
||||
|
Loading…
Reference in New Issue
Block a user