Skip to content

Fix dragging tabs not working properly #789

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
ychin merged 2 commits into from
Nov 25, 2018
Merged

Fix dragging tabs not working properly #789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e126fa9
Fix tab dragging crashing under 10.14 due to deprecated API
ychin Nov 24, 2018
7e1b43e
Fix tab dragging not working when dragging a tab to the right
ychin Nov 24, 2018
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
8 changes: 8 additions & 0 deletions src/MacVim/MMBackend.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2013,6 +2013,14 @@ - (void)handleInputEvent:(int)msgid data:(NSData *)data
// based.
int idx = *((int*)bytes);

// Also, this index doesn't take itself into account, so if the move is
// to a later tab, need to add one to it since Vim's tabpage_move *does*
// count the current tab.
int curtab_index = tabpage_index(curtab);
if (idx >= curtab_index) {
idx += 1;
}

tabpage_move(idx);
} else if (SetTextDimensionsMsgID == msgid || LiveResizeMsgID == msgid
|| SetTextDimensionsNoResizeWindowMsgID == msgid
Expand Down
5 changes: 4 additions & 1 deletion src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,10 @@ - (NSImage*)dragImageForRect:(NSRect)cellFrame
if(([self state] == NSOnState) && ([[_controlView styleName] isEqualToString:@"Metal"]))
cellFrame.size.width += 1.0;
[_controlView lockFocus];
NSBitmapImageRep *rep = [[[NSBitmapImageRep alloc] initWithFocusedViewRect:cellFrame] autorelease];

NSBitmapImageRep *rep = [[self controlView] bitmapImageRepForCachingDisplayInRect:cellFrame];
[[self controlView] cacheDisplayInRect:cellFrame toBitmapImageRep:rep];

[_controlView unlockFocus];
NSImage *image = [[[NSImage alloc] initWithSize:[rep size]] autorelease];
[image addRepresentation:rep];
Expand Down