mirror of
https://git.sr.ht/~eliasnaur/gio
synced 2026-07-06 01:45:36 +00:00
app: ignore app.Size when in fullscreen mode
Setting the window size while in fulscreen mode does not make sense. Fixes gio#220 Signed-off-by: Pierre Curto <pierre.curto@gmail.com>
This commit is contained in:
+1
-1
@@ -226,7 +226,7 @@ func (w *window) Configure(options []Option) {
|
|||||||
cnf.MinSize = cnf.MinSize.Div(int(screenScale))
|
cnf.MinSize = cnf.MinSize.Div(int(screenScale))
|
||||||
cnf.MaxSize = cnf.MaxSize.Div(int(screenScale))
|
cnf.MaxSize = cnf.MaxSize.Div(int(screenScale))
|
||||||
|
|
||||||
if prev.Size != cnf.Size {
|
if cnf.Mode != Fullscreen && prev.Size != cnf.Size {
|
||||||
w.config.Size = cnf.Size
|
w.config.Size = cnf.Size
|
||||||
C.setSize(w.window, C.CGFloat(cnf.Size.X), C.CGFloat(cnf.Size.Y))
|
C.setSize(w.window, C.CGFloat(cnf.Size.X), C.CGFloat(cnf.Size.Y))
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -496,7 +496,7 @@ func (w *window) Configure(options []Option) {
|
|||||||
cnf := w.config
|
cnf := w.config
|
||||||
cnf.apply(cfg, options)
|
cnf.apply(cfg, options)
|
||||||
|
|
||||||
if prev.Size != cnf.Size {
|
if cnf.Mode != Fullscreen && prev.Size != cnf.Size {
|
||||||
width := int32(cnf.Size.X)
|
width := int32(cnf.Size.X)
|
||||||
height := int32(cnf.Size.Y)
|
height := int32(cnf.Size.Y)
|
||||||
w.config.Size = cnf.Size
|
w.config.Size = cnf.Size
|
||||||
|
|||||||
+1
-1
@@ -137,7 +137,7 @@ func (w *x11Window) Configure(options []Option) {
|
|||||||
C.XSetWMNormalHints(w.x, w.xw, &shints)
|
C.XSetWMNormalHints(w.x, w.xw, &shints)
|
||||||
}
|
}
|
||||||
|
|
||||||
if prev.Size != cnf.Size {
|
if cnf.Mode != Fullscreen && prev.Size != cnf.Size {
|
||||||
w.config.Size = cnf.Size
|
w.config.Size = cnf.Size
|
||||||
C.XResizeWindow(w.x, w.xw, C.uint(cnf.Size.X), C.uint(cnf.Size.Y))
|
C.XResizeWindow(w.x, w.xw, C.uint(cnf.Size.X), C.uint(cnf.Size.Y))
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -625,7 +625,8 @@ func Title(t string) Option {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Size sets the size of the window.
|
// Size sets the size of the window. The option is ignored
|
||||||
|
// in Fullscreen mode.
|
||||||
func Size(w, h unit.Value) Option {
|
func Size(w, h unit.Value) Option {
|
||||||
if w.V <= 0 {
|
if w.V <= 0 {
|
||||||
panic("width must be larger than or equal to 0")
|
panic("width must be larger than or equal to 0")
|
||||||
|
|||||||
Reference in New Issue
Block a user