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

Fix CGSPrivate (again) #2150

Merged
merged 2 commits into from
Nov 7, 2015
Merged

Fix CGSPrivate (again) #2150

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
6c1cba5
Revert "Make those NSIntegers so some warnings go away"
tiennou Nov 7, 2015
93e343e
Fix the windowNumber warnings
tiennou Nov 7, 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
6 changes: 3 additions & 3 deletions Quicksilver/Code-External/CGSPrivate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
*/

// Internal CoreGraphics typedefs
typedef NSInteger CGSConnection;
typedef NSInteger CGSWindow;
typedef NSInteger CGSValue;
typedef int CGSConnection;
typedef int CGSWindow;
typedef int CGSValue;

//// CONSTANTS ////

Expand Down
8 changes: 4 additions & 4 deletions Quicksilver/Code-QuickStepEffects/QSWindowAnimation.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,15 @@ - (void)setCurrentProgress:(NSAnimationProgress)progress {
CGSSetWindowAlpha(cgs, wid, alpha);

if ([childWindows count]) {
CGSSetWindowAlpha(cgs, [[childWindows lastObject] windowNumber] , alpha);
CGSSetWindowAlpha(cgs, (int)[[childWindows lastObject] windowNumber] , alpha);
}
if (progress == 1.0f)
[_window setAlphaValue:alpha];

}
if (brightFt) {
CGFloat brightness = (*brightFt) (self, _percent);
CGSSetWindowListBrightness(cgs, &wid, &brightness, 1);
CGSSetWindowListBrightness(cgs, &wid, (float *)&brightness, 1);
}
if (progress == 1.0f)
[self finishAnimation];
Expand All @@ -140,7 +140,7 @@ - (NSWindow *)window { return _window; }
- (void)setWindow:(NSWindow *)aWindow {
if(_window != aWindow){
_window = aWindow;
wid = [aWindow windowNumber];
wid = (int)[aWindow windowNumber];
}
}

Expand Down Expand Up @@ -174,7 +174,7 @@ - (void)finishAnimation {
// [_window setAlphaValue:1.0f];

}
CGSSetWindowListBrightness(cgs, &wid, &_brightA, 1);
CGSSetWindowListBrightness(cgs, &wid, (float *)&_brightA, 1);

}

Expand Down