Mercurial > emacs
changeset 101404:8bf66a156bc5
* nsimage.m (setPixmapData:): Set to ignore image DPI.
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Fri, 23 Jan 2009 14:08:24 +0000 |
| parents | 9c7e692c226a |
| children | fd15717d12c3 |
| files | src/ChangeLog src/nsimage.m |
| diffstat | 2 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Jan 23 13:52:24 2009 +0000 +++ b/src/ChangeLog Fri Jan 23 14:08:24 2009 +0000 @@ -3,14 +3,19 @@ * emacs.c (main): Do fork+exec under --daemon in Cocoa. (ns_no_defaults): New declaration. (main): Use it. + * nsterm.h (ns_no_defaults): New declaration. + * nsfns.m (x_get_string_resource): Don't read when ns_no_defaults. + * nsterm.m (ns_no_defaults): New variable. (ns_initialize): Don't read defaults when ns_no_defaults. (EmacsView-readSelectionFromPasteboard:) (writeSelectionToPasteboard:types:): New stubbed-out methods for NSServicesRequests protocol. (Bug#1435) + * nsimage.m (setPixmapData:): Set to ignore image DPI. + 2009-01-23 Giorgos Keramidas <keramida@freebsd.org> (tiny change) * alloc.c (mark_stack): Use "flushw" instead of "ta 3" assembly
--- a/src/nsimage.m Fri Jan 23 13:52:24 2009 +0000 +++ b/src/nsimage.m Fri Jan 23 14:08:24 2009 +0000 @@ -400,6 +400,12 @@ if ([bmRep numberOfPlanes] >= 3) [bmRep getBitmapDataPlanes: pixmapData]; + + /* The next two lines cause the DPI of the image to be ignored. + This seems to be the behavior users expect. */ + [self setScalesWhenResized: YES]; + [self setSize: NSMakeSize([bmRep pixelsWide], [bmRep pixelsHigh])]; + break; } }