Skip to content

Fix rendering issue in Split View on El Capitan #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
splhack merged 3 commits into from
Oct 11, 2015
Merged

Fix rendering issue in Split View on El Capitan #86

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ce1cb4
Fix rendering issue in Split View on El Capitan
splhack Oct 9, 2015
2c51e2c
Fix full-screen redraw issues on El Capitan
splhack Oct 10, 2015
13b3544
Reorder methods
splhack Oct 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 27 additions & 3 deletions src/MacVim/MMWindowController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1021,13 +1021,19 @@ - (void)windowDidMove:(NSNotification *)notification

- (void)windowDidResize:(id)sender
{
if (resizingDueToMove)
{
if (resizingDueToMove) {
resizingDueToMove = NO;
return;
}

if (!setupDone || fullScreenEnabled) return;
if (!setupDone)
return;

// NOTE: We need to update the window frame size for Split View even though
// in full-screen on El Capitan or later.
if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_10_Max
&& fullScreenEnabled)
return;

// NOTE: Since we have no control over when the window may resize (Cocoa
// may resize automatically) we simply set the view to fill the entire
Expand Down Expand Up @@ -1212,6 +1218,15 @@ - (void)windowWillEnterFullScreen:(NSNotification *)notification
}
}

- (void)windowDidEnterFullScreen:(NSNotification *)notification
{
if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_10_Max) {
// NOTE: On El Capitan, we need to redraw the view when entering
// full-screen using :fullscreen option (including Ctrl-Cmd-f).
[vimController sendMessage:BackingPropertiesChangedMsgID data:nil];
}
}

- (void)windowDidFailToEnterFullScreen:(NSWindow *)window
{
// NOTE: This message can be called without
Expand Down Expand Up @@ -1280,6 +1295,15 @@ - (void)windowWillExitFullScreen:(NSNotification *)notification
}
}

- (void)windowDidExitFullScreen:(NSNotification *)notification
{
if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_10_Max) {
// NOTE: On El Capitan, we need to redraw the view when leaving
// full-screen by moving the window out from Split View.
[vimController sendMessage:BackingPropertiesChangedMsgID data:nil];
}
}

- (void)windowDidFailToExitFullScreen:(NSWindow *)window
{
// TODO: Is this the correct way to deal with this message? Are we still
Expand Down