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

[v3 linux] api changes (#2830)

Browse source
This commit is contained in:
Travis McLane 2023-08-18 15:12:34 -05:00 • committed by GitHub
commit 4804b34208
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
v3/internal/assetserver/webview/responsewriter_linux.go
View file

@ -28,11 +28,16 @@ type responseWriter struct {
header http.Header
wroteHeader bool
finished bool
code int
w io.WriteCloser
wErr error
}
func (rw *responseWriter) Code() int {
return rw.code
}
func (rw *responseWriter) Header() http.Header {
if rw.header == nil {
rw.header = http.Header{}
@ -53,6 +58,7 @@ func (rw *responseWriter) Write(buf []byte) (int, error) {
}
func (rw *responseWriter) WriteHeader(code int) {
rw.code = code
if rw.wroteHeader || rw.finished {
return
}

10
v3/internal/assetserver/webview/responsewriter_linux_purego.go
View file

@ -52,9 +52,13 @@ type responseWriter struct {
header http.Header
wroteHeader bool
finished bool
code int
w io.WriteCloser
wErr error
}
w io.WriteCloser
wErr error
func (rw *responseWriter) Code() int {
return rw.code
}
func (rw *responseWriter) Header() http.Header {
@ -77,6 +81,8 @@ func (rw *responseWriter) Write(buf []byte) (int, error) {
}
func (rw *responseWriter) WriteHeader(code int) {
rw.code = code
// TODO? Is this ever called? I don't think so!
if rw.wroteHeader || rw.finished {
return

8
v3/pkg/application/application_linux.go
View file

@ -83,7 +83,7 @@ func (m *linuxApp) run() error {
// Add a hook to the ApplicationDidFinishLaunching event
// FIXME: add Wails specific events - i.e. Shouldn't platform specific ones be translated to Wails events?
m.parent.On(events.Mac.ApplicationDidFinishLaunching, func() {
m.parent.On(events.Mac.ApplicationDidFinishLaunching, func(evt *Event) {
// Do we need to do anything now?
fmt.Println("events.Mac.ApplicationDidFinishLaunching received!")
})
@ -107,6 +107,12 @@ func (m *linuxApp) registerWindow(window pointer, id uint) {
m.windowsLock.Unlock()
}
func (m *linuxApp) isDarkMode() bool {
// FIXME: How do we detect this?
// Maybe this helps: https://askubuntu.com/questions/1469869/how-does-firefox-detect-light-dark-theme-change-on-kde-systems
return false
}
func newPlatformApp(parent *App) *linuxApp {
name := strings.ToLower(strings.Replace(parent.options.Name, " ", "", -1))
if name == "" {

2
v3/pkg/application/systemtray_linux.go
View file

@ -20,7 +20,7 @@ func (s *linuxSystemTray) setMenu(menu *Menu) {
s.menu = menu
}
func (s *linuxSystemTray) positionWindow(window *WebviewWindow) error {
func (s *linuxSystemTray) positionWindow(window *WebviewWindow, offset int) error {
panic("not implemented")
}

2
v3/pkg/application/webview_window_linux.go
View file

@ -448,7 +448,7 @@ func (w *linuxWebviewWindow) run() {
}
// We need to wait for the HTML to load before we can execute the javascript
// FIXME: What event is this? DomReady?
w.parent.On(events.Mac.WebViewDidFinishNavigation, func(_ *WindowEventContext) {
w.parent.On(events.Mac.WebViewDidFinishNavigation, func(_ *WindowEvent) {
if w.parent.options.JS != "" {
w.execJS(w.parent.options.JS)
}