deblan-mirror/wails
1
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2026-03-14 14:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix resizable

Browse source
This commit is contained in:
Lea Anthony 2022-12-11 11:26:21 +11:00
commit 4a2cf597c2
No known key found for this signature in database
GPG key ID: 33DAF7BB90A58405
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
exp/examples/basic/main.go
View file

@ -62,6 +62,18 @@ func main() {
}()
go func() {
for {
time.Sleep(5 * time.Second)
println("window 1 is fullscreen?", myWindow.IsFullscreen())
println("window 2 is fullscreen?", myWindow2.IsFullscreen())
println("window 1 is maximised?", myWindow.IsMaximised())
println("window 2 is maximised?", myWindow2.IsMaximised())
println("window 1 is minimised?", myWindow.IsMinimised())
println("window 2 is minimised?", myWindow2.IsMinimised())
}
}()
go func() {
time.Sleep(5 * time.Second)
myWindow.SetTitle("Wooooo")

7
exp/pkg/application/window_darwin.go
View file

@ -16,7 +16,7 @@ package application
// Create a new Window
void* windowNew(unsigned int id, int width, int height) {
NSWindow* window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, width-1, height-1)
styleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskMiniaturizable
styleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable
backing:NSBackingStoreBuffered
defer:NO];
@ -123,7 +123,7 @@ void navigationLoadURL(void* nsWindow, char* url) {
void windowSetResizable(void* nsWindow, bool resizable) {
// Set window resizable on main thread
dispatch_async(dispatch_get_main_queue(), ^{
[(NSWindow*)nsWindow setStyleMask:resizable ? NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskMiniaturizable : NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable];
[(NSWindow*)nsWindow setStyleMask:resizable ? NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable : NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable];
});
}
@ -277,7 +277,6 @@ bool windowIsMaximised(void* nsWindow) {
}
bool windowIsFullscreen(void* nsWindow) {
// Get window fullscreen on main thread
return [(NSWindow*)nsWindow styleMask] & NSWindowStyleMaskFullScreen;
}
@ -444,7 +443,7 @@ func (w *macosWindow) syncMainThreadReturningBool(fn func() bool) bool {
result = fn()
wg.Done()
})
wg.Done()
wg.Wait()
return result
}