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

Remove C.toggleFullscreen

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

8
exp/pkg/application/window.go
View file

@ -29,7 +29,6 @@ type (
destroy()
reload()
forceReload()
toggleFullscreen()
toggleDevTools()
resetZoom()
zoomIn()
@ -380,7 +379,11 @@ func (w *Window) ToggleFullscreen() {
if w.impl == nil {
return
}
w.impl.toggleFullscreen()
if w.IsFullscreen() {
w.UnFullscreen()
} else {
w.Fullscreen()
}
}
func (w *Window) ToggleDevTools() {
@ -467,6 +470,7 @@ func (w *Window) Maximise() *Window {
return w
}
if !w.IsMaximised() {
w.disableSizeConstraints()
w.impl.maximise()
}
return w

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

@ -338,27 +338,22 @@ bool windowIsMinimised(void* nsWindow) {
return [(NSWindow*)nsWindow isMiniaturized];
}
// toggle fullscreen
void windowToggleFullscreen(void* nsWindow) {
// Toggle fullscreen on main thread
dispatch_async(dispatch_get_main_queue(), ^{
[(NSWindow*)nsWindow toggleFullScreen:nil];
});
}
// Set Window fullscreen
void windowFullscreen(void* nsWindow) {
if( windowIsFullscreen(nsWindow) ) {
return;
}
windowToggleFullscreen(nsWindow);
}
dispatch_async(dispatch_get_main_queue(), ^{
[(NSWindow*)nsWindow toggleFullScreen:nil];
});}
void windowUnFullscreen(void* nsWindow) {
if( !windowIsFullscreen(nsWindow) ) {
return;
}
windowToggleFullscreen(nsWindow);
dispatch_async(dispatch_get_main_queue(), ^{
[(NSWindow*)nsWindow toggleFullScreen:nil];
});
}
// restore window to normal size
@ -773,10 +768,6 @@ func (w *macosWindow) toggleDevTools() {
showDevTools(w.nsWindow)
}
func (w *macosWindow) toggleFullscreen() {
C.windowToggleFullscreen(w.nsWindow)
}
func (w *macosWindow) reload() {
//TODO: Implement
println("reload called on Window", w.parent.id)