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

app/internal/wm: use Option method to initialize windows

Browse Source 
Added (*w.window).Option methods to the backends and use them for setting the initial options passed into NewWindow.

Signed-off-by: pierre <pierre.curto@gmail.com>
This commit is contained in:
pierre
2021-04-02 19:23:17 +02:00
committed by Elias Naur
parent b77c1628f3
commit ce7f0da06e
10 changed files with 207 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/internal/wm/os_windows.go
+42 -24
View File
@@ -116,15 +116,13 @@ func NewWindow(window Callbacks, opts *Options) error {
w.w = window
w.w.SetDriver(w)
defer w.w.Event(system.DestroyEvent{})
w.Option(opts)
windows.ShowWindow(w.hwnd, windows.SW_SHOWDEFAULT)
windows.SetForegroundWindow(w.hwnd)
windows.SetFocus(w.hwnd)
// Since the window class for the cursor is null,
// set it here to show the cursor.
w.SetCursor(pointer.CursorDefault)
if o := opts.WindowMode; o != nil {
w.SetWindowMode(*o)
}
if err := w.loop(); err != nil {
panic(err)
}
@@ -185,33 +183,15 @@ func createNativeWindow(opts *Options) (*window, error) {
}
dpi := windows.GetSystemDPI()
cfg := configForDPI(dpi)
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)
deltas := winDeltas{
width: wr.Right,
height: wr.Bottom,
}
windows.AdjustWindowRectEx(&wr, dwStyle, 0, dwExStyle)
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,
title,
"",
dwStyle|windows.WS_CLIPSIBLINGS|windows.WS_CLIPCHILDREN,
windows.CW_USEDEFAULT, windows.CW_USEDEFAULT,
wr.Right-wr.Left,
wr.Bottom-wr.Top,
windows.CW_USEDEFAULT, windows.CW_USEDEFAULT,
0,
0,
resources.handle,
@@ -222,7 +202,6 @@ func createNativeWindow(opts *Options) (*window, error) {
w := &window{
hwnd: hwnd,
minmax: getWindowConstraints(cfg, opts),
deltas: deltas,
opts: opts,
}
w.hdc, err = windows.GetDC(hwnd)
@@ -540,6 +519,45 @@ func (w *window) readClipboard() error {
return nil
}
func (w *window) Option(opts *Options) {
if o := opts.Size; o != nil {
dpi := windows.GetSystemDPI()
cfg := configForDPI(dpi)
width := int32(cfg.Px(o.Width))
height := int32(cfg.Px(o.Height))
// Include the window decorations.
wr := windows.Rect{
Right: width,
Bottom: height,
}
dwStyle := uint32(windows.WS_OVERLAPPEDWINDOW)
dwExStyle := uint32(windows.WS_EX_APPWINDOW | windows.WS_EX_WINDOWEDGE)
windows.AdjustWindowRectEx(&wr, dwStyle, 0, dwExStyle)
dw, dh := width, height
width = wr.Right - wr.Left
height = wr.Bottom - wr.Top
w.deltas.width = width - dw
w.deltas.height = height - dh
w.opts.Size = o
windows.MoveWindow(w.hwnd, 0, 0, width, height, true)
}
if o := opts.MinSize; o != nil {
w.opts.MinSize = o
}
if o := opts.MaxSize; o != nil {
w.opts.MaxSize = o
}
if o := opts.Title; o != nil {
windows.SetWindowText(w.hwnd, *opts.Title)
}
if o := opts.WindowMode; o != nil {
w.SetWindowMode(*o)
}
}
func (w *window) SetWindowMode(mode WindowMode) {
// https://devblogs.microsoft.com/oldnewthing/20100412-00/?p=14353
switch mode {