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

subclass windows in macos so they can be made resizable even with no decorations #408

Merged
merged 10 commits into from
Apr 2, 2018
Merged

subclass windows in macos so they can be made resizable even with no decorations #408

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
78b2441
make windows without decorations resizable and movable in macos
sodiumjoe Feb 19, 2018
af27f5d
remove `isMovableByWindowBackground` and `mouseDownCanMoveWindow`
sodiumjoe Feb 19, 2018
bcb7737
revert example changes
sodiumjoe Feb 19, 2018
23f594f
remove resizable mask from decoration: false
sodiumjoe Mar 8, 2018
c169567
Merge branch 'master' into 368-resize-no-decorations-macos
sodiumjoe Mar 23, 2018
fc15524
avoid duplicate class declarations
sodiumjoe Mar 27, 2018
a2e457a
update changelog
sodiumjoe Apr 2, 2018
e7e5d97
Merge branch 'master' into 368-resize-no-decorations-macos
sodiumjoe Apr 2, 2018
bc86ed7
fix changelog
sodiumjoe Apr 2, 2018
ab38e93
changelog whitespace
sodiumjoe Apr 2, 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
2 changes: 2 additions & 0 deletions examples/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
extern crate winit;
use winit::os::macos::WindowBuilderExt;

fn main() {
let mut events_loop = winit::EventsLoop::new();

let _window = winit::WindowBuilder::new()
.with_title("A fantastic window!")
.with_decorations(false)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure we want that in the example.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yup, that was just from my testing, I've removed it

.build(&events_loop)
.unwrap();

Expand Down
19 changes: 15 additions & 4 deletions src/platform/macos/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,12 +431,19 @@ impl Window2 {
NSWindowStyleMask::NSResizableWindowMask | NSWindowStyleMask::NSTitledWindowMask
} else {
// Window2 without a titlebar
NSWindowStyleMask::NSClosableWindowMask | NSWindowStyleMask::NSMiniaturizableWindowMask |
NSWindowStyleMask::NSResizableWindowMask |
NSWindowStyleMask::NSFullSizeContentViewWindowMask
NSWindowStyleMask::NSBorderlessWindowMask |
NSWindowStyleMask::NSResizableWindowMask
};

let window = IdRef::new(NSWindow::alloc(nil).initWithContentRect_styleMask_backing_defer_(
let window_superclass = Class::get("NSWindow").unwrap();
let mut decl = ClassDecl::new("WinitWindow", window_superclass).unwrap();
decl.add_method(sel!(canBecomeMainWindow), yes as extern fn(&Object, Sel) -> BOOL);
decl.add_method(sel!(canBecomeKeyWindow), yes as extern fn(&Object, Sel) -> BOOL);
decl.register();

let window: id = msg_send![Class::get("WinitWindow").unwrap(), alloc];

let window = IdRef::new(window.initWithContentRect_styleMask_backing_defer_(
frame,
masks,
appkit::NSBackingStoreBuffered,
Expand Down Expand Up @@ -760,3 +767,7 @@ impl Clone for IdRef {
IdRef(self.0)
}
}

extern fn yes(_: &Object, _: Sel) -> BOOL {
YES
}