Skip to content

Properly size General pane when DISABLE_SPARKLE=1 #1089

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
merged 1 commit into from
Sep 20, 2020
Merged

Properly size General pane when DISABLE_SPARKLE=1 #1089

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 21 additions & 5 deletions src/MacVim/MMPreferenceController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,31 @@ static void loadSymbols()

@implementation MMPreferenceController

- (void)windowDidLoad
{
#if DISABLE_SPARKLE
// If Sparkle is disabled in config, we don't want to show the preference pane
// which could be confusing as it won't do anything.
// After hiding the Sparkle subview, shorten the height of the General pane
// and move its other subviews down.
[sparkleUpdaterPane setHidden:YES];
CGFloat sparkleHeight = NSHeight(sparkleUpdaterPane.frame);
NSRect frame = generalPreferences.frame;
frame.size.height -= sparkleHeight;
generalPreferences.frame = frame;
for (NSView *subview in generalPreferences.subviews) {
frame = subview.frame;
frame.origin.y -= sparkleHeight;
subview.frame = frame;
}
#endif
[super windowDidLoad];
}

- (IBAction)showWindow:(id)sender
{
[super setCrossFade:NO];
[super showWindow:sender];
#if DISABLE_SPARKLE
// If Sparkle is disabled in config, we don't want to show the preference pane
// which could be confusing as it won't do anything.
[sparkleUpdaterPane setHidden:YES];
#endif
}

- (void)setupToolbar
Expand Down