Commit 4c7077c3 authored by Adrian Robert's avatar Adrian Robert
Browse files

* nsimage.m (EmacsImage+allocInitFromFile:): Set to ignore DPI. (Bug#1316)

parent a9b4df69
2009-01-21 Adrian Robert <>
* nsmenu.m (NSMENUPROFILE): Change #if style.
* nsterm.m: (x_set_frame_alpha): Add prototype.
(ns_fake_keydown, EmacsView-keyUp:): New variable and function to
handle Ctrl-tab. (Bug#1841)
(ns_get_color): Use unsigned long long for scanned hex string value.
(ns_term_shutdown): Abort on non SIGTERM signals.
* nsimage.m (EmacsImage+allocInitFromFile:): Set to ignore DPI.
2009-01-19 Chong Yidong <>
* xfaces.c (Finternal_set_lisp_face_attribute, Fx_list_fonts):
......@@ -163,6 +163,7 @@ @implementation EmacsImage
+ allocInitFromFile: (Lisp_Object)file
EmacsImage *image = ImageList;
NSImageRep *imgRep;
Lisp_Object found;
/* look for an existing image of the same name */
......@@ -185,12 +186,18 @@ @implementation EmacsImage
image = [[EmacsImage alloc] initByReferencingFile:
[NSString stringWithUTF8String: SDATA (found)]];
if ([image bestRepresentationForDevice: nil] == nil)
imgRep = [image bestRepresentationForDevice: nil];
if (imgRep == nil)
[image release];
return nil;
/* The next two lines cause the DPI of the image to be ignored.
This seems to be the behavior users expect. */
[image setScalesWhenResized: YES];
[image setSize: NSMakeSize([imgRep pixelsWide], [imgRep pixelsHigh])];
[image setName: [NSString stringWithUTF8String: SDATA (file)]];
[image reference];
ImageList = [image imageListSetNext: ImageList];
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment