procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* nsterm.m (constrainFrameRect): Always constrain when there is only

Browse source 
one screen.

Fixes: debbugs:10962
This commit is contained in:
Jan Djärv 2012-04-09 12:01:04 +02:00
parent 0c2014a3c2
commit aff67c8241
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2012-04-09 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (constrainFrameRect): Always constrain when there is only
one screen (Bug#10962).
2012-04-06 Eli Zaretskii <eliz@gnu.org>
* buffer.h (FETCH_CHAR, FETCH_MULTIBYTE_CHAR):

8
src/nsterm.m
View file

@ -6038,11 +6038,15 @@ @implementation EmacsWindow
restrict the height to just one monitor. So we override this. */
- (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen
{
/* When making the frame visible for the first time, we want to
constrain. Other times not. */
/* When making the frame visible for the first time or if there is just
one screen, we want to constrain. Other times not. */
NSUInteger nr_screens = [[NSScreen screens] count];
struct frame *f = ((EmacsView *)[self delegate])->emacsframe;
NSTRACE (constrainFrameRect);
if (nr_screens == 1)
return [super constrainFrameRect:frameRect toScreen:screen];
if (f->output_data.ns->dont_constrain
|| ns_menu_bar_should_be_hidden ())
return frameRect;