Skip to content

Fix issues #8 and #12 #13

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

Open
DanielGibbsNZ wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix issues #8 and #12 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2411726
Remove settings style mask to NSFullSizeContentViewWindowMask. Fixes #12
DanielGibbsNZ Mar 6, 2015
bd0a4bb
Update tracking areas for titlebar buttons. Fixes #8
DanielGibbsNZ Mar 6, 2015
cf750fb
Merge remote-tracking branch 'upstream/master'
DanielGibbsNZ Jun 17, 2015
785d378
- Gotta inherit from this guy
scornflake Sep 9, 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
2 changes: 1 addition & 1 deletion WAYWindow/WAYWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
- Check out the WWDC '14 session `Adopting Advanced Features of the New UI of OS X Yosemite´, which provides more details on how to make use of the new Yosemite APIs.
- Also check out the new APIs in NSScrollView to make use of contentInsets, scrollInsets, and more.
*/
@interface WAYWindow : NSWindow
@interface WAYWindow : MouseMovementWindow

/// Returns YES, if the class supports vibrant appearances. Can be used to determine if running on OS X 10.10+
+ (BOOL) supportsVibrantAppearances;
Expand Down
5 changes: 4 additions & 1 deletion WAYWindow/WAYWindow.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,6 @@ - (void) _setUp {
kWAYWindowDefaultTrafficLightButtonsLeftMargin = NSMinX(closeButton.frame);
kWAYWindowDefaultTrafficLightButtonsTopMargin = NSHeight(closeButton.superview.frame)-NSMaxY(closeButton.frame);

self.styleMask |= NSFullSizeContentViewWindowMask;
_trafficLightButtonsLeftMargin = kWAYWindowDefaultTrafficLightButtonsLeftMargin;
_trafficLightButtonsTopMargin = kWAYWindowDefaultTrafficLightButtonsTopMargin;

Expand All @@ -339,6 +338,10 @@ - (void) _setNeedsLayout {
frame.origin.x = _trafficLightButtonsLeftMargin +idx*(NSWidth(frame) + 6);
[standardButton setFrame:frame];
}];

NSView *themeFrame = self.titleBarView.superview.superview;
[themeFrame viewWillStartLiveResize];
[themeFrame viewDidEndLiveResize];
}

#pragma mark - NSWindow Delegate
Expand Down