Skip to content
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

Jump to bottom

Small fixes #1665

Merged
merged 3 commits into from
Nov 4, 2013
Merged

Small fixes #1665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b59194
use the variable created a few lines earlier
skurfer Nov 1, 2013
c24e2be
return self from the initializer
skurfer Nov 1, 2013
6fd1055
remove a repeated line
skurfer Nov 1, 2013
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
2 changes: 1 addition & 1 deletion Quicksilver/Code-QuickStepCore/QSObject_URLHandling.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ - (void)buildWebSearchIconForObject:(QSObject *)object {
}

[NSGraphicsContext saveGraphicsState];
[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]];
[NSGraphicsContext setCurrentContext:graphicsContext];
rect = NSMakeRect(0, 0, imageSize.width, imageSize.height);
[image setSize:rect.size];
[image drawInRect:rect fromRect:rectFromSize([image size]) operation:NSCompositeSourceOver fraction:1.0];
Expand Down
4 changes: 2 additions & 2 deletions Quicksilver/Code-QuickStepInterface/QSResultWindow.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#import "QSResultWindow.h"
@implementation QSResultWindow
- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag {
NSWindow* result = [super initWithContentRect:contentRect styleMask:aStyle | NSResizableWindowMask backing:bufferingType defer:YES];
self = [super initWithContentRect:contentRect styleMask:aStyle | NSResizableWindowMask backing:bufferingType defer:YES];
[self setOpaque:![[NSUserDefaults standardUserDefaults] boolForKey:@"QSResultsUseAlpha"]];

[self setShowEffect:[NSDictionary dictionaryWithObjectsAndKeys:@"QSSlightGrowEffect", @"transformFn", @"show", @"type", [NSNumber numberWithDouble:0.05] , @"duration", nil]];
Expand All @@ -17,7 +17,7 @@ - (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backi
[self setBackgroundColor:[NSColor clearColor]];
[self setMovableByWindowBackground:NO];
[self setShowsResizeIndicator:YES];
return (QSResultWindow *)result;
return self;
}

- (NSTimeInterval)animationResizeTime:(NSRect)newFrame {
Expand Down
1 change: 0 additions & 1 deletion Quicksilver/PlugIns-Main/Bezel/QSBezelInterfaceController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ - (void)windowDidLoad {
for(QSSearchObjectView *theControl in theControls) {
QSObjectCell *theCell = [theControl cell];
[theCell setAlignment:NSCenterTextAlignment];
[theControl setPreferredEdge:NSMinYEdge];
[theControl setResultsPadding:NSMinY([dSelector frame])];
[theControl setPreferredEdge:NSMinYEdge];
[(QSWindow *)[(theControl)->resultController window] setHideOffset:NSMakePoint(0, NSMinY([iSelector frame]))];
Expand Down