joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-01 15:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

app: don't apply fallback decorations when CustomRenderer is set

Browse Source 
Fixes the opengl example on client-side decorated Wayland servers.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2022-02-01 10:59:58 +01:00
parent 7204632c39
commit 12deba2195
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/window.go
+8 -3
View File
@@ -612,12 +612,12 @@ func (w *Window) processEvent(d driver, e event.Event) {
w.waitAck(d)
case wakeupEvent:
case ConfigEvent:
if w.decorations.Config.Decorated != e2.Config.Decorated && e2.Config.Decorated {
w.decorations.Config = e2.Config
if !w.fallbackDecorate() {
// Decorations are no longer applied.
w.decorations.Decorations = nil
w.decorations.size = image.Point{}
}
w.decorations.Config = e2.Config
e2.Config.Size = e2.Config.Size.Sub(w.decorations.size)
w.out <- e2
case event.Event:
@@ -678,9 +678,14 @@ func (w *Window) updateCursor(d driver) {
}
}
func (w *Window) fallbackDecorate() bool {
cnf := w.decorations.Config
return !cnf.Decorated && cnf.Mode != Fullscreen && !w.nocontext
}
// decorate the window if enabled and returns the corresponding Insets.
func (w *Window) decorate(d driver, e system.FrameEvent, o *op.Ops) image.Point {
if w.decorations.Config.Decorated || w.decorations.Config.Mode == Fullscreen {
if !w.fallbackDecorate() {
return e.Size
}
theme := w.decorations.Theme