Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
aff67c82
Commit
aff67c82
authored
Apr 09, 2012
by
Jan Djärv
Browse files
* nsterm.m (constrainFrameRect): Always constrain when there is only
one screen. Fixes: debbugs:10962
parent
0c2014a3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
src/ChangeLog
src/ChangeLog
+5
-0
src/nsterm.m
src/nsterm.m
+6
-2
No files found.
src/ChangeLog
View file @
aff67c82
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):
...
...
src/nsterm.m
View file @
aff67c82
...
...
@@ -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;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment