joejulian/gio-patched
1
0
Fork 0
forked from joejulian/gio
Code Pull Requests 1 Activity

app/internal/wm: change Options fields from values to pointers

Browse Source 
Switching to pointer values in Options, including using window manager defaults for size and title, in preparation for updating options on the fly.

Signed-off-by: pierre <pierre.curto@gmail.com>
This commit is contained in:
pierre
2021-04-02 10:22:04 +02:00
committed by Elias Naur
parent 9d7b57f74a
commit 6330caad95
7 changed files with 110 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/internal/wm/os_windows.go
+21 -9
View File
@@ -122,7 +122,9 @@ func NewWindow(window Callbacks, opts *Options) error {
// Since the window class for the cursor is null,
// set it here to show the cursor.
w.SetCursor(pointer.CursorDefault)
w.SetWindowMode(opts.WindowMode)
if o := opts.WindowMode; o != nil {
w.SetWindowMode(*o)
}
if err := w.loop(); err != nil {
panic(err)
}
@@ -162,10 +164,14 @@ func initResources() error {
func getWindowConstraints(cfg unit.Metric, opts *Options) winConstraints {
var minmax winConstraints
minmax.minWidth = int32(cfg.Px(opts.MinWidth))
minmax.minHeight = int32(cfg.Px(opts.MinHeight))
minmax.maxWidth = int32(cfg.Px(opts.MaxWidth))
minmax.maxHeight = int32(cfg.Px(opts.MaxHeight))
if o := opts.MinSize; o != nil {
minmax.minWidth = int32(cfg.Px(o.Width))
minmax.minHeight = int32(cfg.Px(o.Height))
}
if o := opts.MaxSize; o != nil {
minmax.maxWidth = int32(cfg.Px(o.Width))
minmax.maxHeight = int32(cfg.Px(o.Height))
}
return minmax
}
@@ -179,9 +185,10 @@ func createNativeWindow(opts *Options) (*window, error) {
}
dpi := windows.GetSystemDPI()
cfg := configForDPI(dpi)
wr := windows.Rect{
Right: int32(cfg.Px(opts.Width)),
Bottom: int32(cfg.Px(opts.Height)),
var wr windows.Rect
if o := opts.Size; o != nil {
wr.Right = int32(cfg.Px(o.Width))
wr.Bottom = int32(cfg.Px(o.Height))
}
dwStyle := uint32(windows.WS_OVERLAPPEDWINDOW)
dwExStyle := uint32(windows.WS_EX_APPWINDOW | windows.WS_EX_WINDOWEDGE)
@@ -193,9 +200,14 @@ func createNativeWindow(opts *Options) (*window, error) {
deltas.width = wr.Right - wr.Left - deltas.width
deltas.height = wr.Bottom - wr.Top - deltas.height
var title string
if o := opts.Title; o != nil {
title = *o
}
hwnd, err := windows.CreateWindowEx(dwExStyle,
resources.class,
opts.Title,
title,
dwStyle|windows.WS_CLIPSIBLINGS|windows.WS_CLIPCHILDREN,
windows.CW_USEDEFAULT, windows.CW_USEDEFAULT,
wr.Right-wr.Left,