joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-06 09:55:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

widget/material: update Decorations

Browse Source 
Fix actions not processed and move the Layout method from
Decorations to DecorationsStyle.

Also clarify the comment for the app.Window.Decorated option.

Signed-off-by: Pierre Curto <pierre.curto@gmail.com>
This commit is contained in:
Pierre Curto
2022-01-28 09:56:20 +01:00
committed by Elias Naur
parent 5ce1e98282
commit 030fd8a171
3 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/os_wayland.go
+4 -4
View File
@@ -1068,11 +1068,11 @@ func (w *window) resize(a system.Action) {
case system.ActionResizeNorthWest:
edge = C.XDG_TOPLEVEL_RESIZE_EDGE_TOP_LEFT
case system.ActionResizeNorthEast:
edge = C.XDG_TOPLEVEL_RESIZE_EDGE_BOTTOM_LEFT
edge = C.XDG_TOPLEVEL_RESIZE_EDGE_TOP_RIGHT
case system.ActionResizeSouthEast:
edge = C.XDG_TOPLEVEL_RESIZE_EDGE_BOTTOM_RIGHT
case system.ActionResizeSouthWest:
edge = C.XDG_TOPLEVEL_RESIZE_EDGE_TOP_RIGHT
edge = C.XDG_TOPLEVEL_RESIZE_EDGE_BOTTOM_LEFT
default:
return
}
@@ -1115,9 +1115,9 @@ func (w *window) SetCursor(name pointer.CursorName) {
case pointer.CursorTopLeftResize:
name = "top_left_corner"
case pointer.CursorTopRightResize:
name = "bottom_left_corner"
case pointer.CursorBottomLeftResize:
name = "top_right_corner"
case pointer.CursorBottomLeftResize:
name = "bottom_left_corner"
case pointer.CursorBottomRightResize:
name = "bottom_right_corner"
case pointer.CursorLeftResize:
app/window.go
+11 -11
View File
@@ -68,7 +68,7 @@ type Window struct {
decorations struct {
op.Ops
Config
*material.Decorations
*material.DecorationsStyle
}
callbacks callbacks
@@ -688,7 +688,7 @@ func (w *Window) decorate(d driver, e system.FrameEvent, o *op.Ops) image.Point
if w.decorations.Config.Decorated || w.decorations.Config.Mode == Fullscreen {
return e.Size
}
deco := w.decorations.Decorations
deco := w.decorations.DecorationsStyle
if deco == nil {
theme := material.NewTheme(gofont.Collection())
allActions := system.ActionMinimize | system.ActionMaximize | system.ActionUnmaximize |
@@ -697,10 +697,9 @@ func (w *Window) decorate(d driver, e system.FrameEvent, o *op.Ops) image.Point
system.ActionResizeWest | system.ActionResizeEast |
system.ActionResizeNorthWest | system.ActionResizeSouthWest |
system.ActionResizeNorthEast | system.ActionResizeSouthEast
deco = &material.Decorations{
DecorationsStyle: material.Decorate(theme, allActions),
}
w.decorations.Decorations = deco
style := material.Decorate(theme, allActions)
deco = &style
w.decorations.DecorationsStyle = &style
}
// Update the decorations based on the current window mode.
var actions system.Action
@@ -716,9 +715,9 @@ func (w *Window) decorate(d driver, e system.FrameEvent, o *op.Ops) image.Point
default:
panic(fmt.Errorf("unknown WindowMode %v", m))
}
deco.Perform(actions)
deco.Decorations.Perform(actions)
// Update the window based on the actions on the decorations.
d.Perform(deco.Actions())
d.Perform(deco.Decorations.Actions())
gtx := layout.Context{
Ops: o,
@@ -728,7 +727,7 @@ func (w *Window) decorate(d driver, e system.FrameEvent, o *op.Ops) image.Point
Constraints: layout.Exact(e.Size),
}
rec := op.Record(o)
dims := deco.Decorate(gtx, w.decorations.Config.Title)
dims := deco.Layout(gtx, w.decorations.Config.Title)
op.Defer(o, rec.Stop())
// Offset to place the frame content below the decorations.
size := image.Point{Y: dims.Size.Y}
@@ -837,8 +836,9 @@ func CustomRenderer(custom bool) Option {
}
}
// Decorated controls whether automatic window decorations
// are enabled.
// Decorated controls whether Gio and/or the platform are responsible
// for drawing window decorations. Providing false indicates that
// the application will either be undecorated or will draw its own decorations.
func Decorated(enabled bool) Option {
return func(_ unit.Metric, cnf *Config) {
cnf.Decorated = enabled