evan
/
vvin
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Releases Activity

resolves #1, accept size/pos as percentage of screen size

This commit is contained in:
ShuheiKubota 2019-11-09 16:20:38 +09:00
parent 6beeb6f004
commit 0d920b177c
1 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
vvin.go
View File

@ -3,7 +3,9 @@ package main
import ( import (
"errors" "errors"
"fmt" "fmt"
"math"
"os" "os"
"strconv"
"strings" "strings"
"syscall" "syscall"
"time" "time"
@ -34,7 +36,8 @@ type globalCmd struct {
targetHandle syscall.Handle targetHandle syscall.Handle
scrWidth, scrHeight int scrWidth, scrHeight int
frameWidth, frameHeight int
} }
func (c *globalCmd) Before() error { func (c *globalCmd) Before() error {
@ -108,10 +111,10 @@ func (c maxCmd) Run(g globalCmd) {
} }
type resizeCmd struct { type resizeCmd struct {
Left int `cli:"left,x"` Left string `cli:"left,x" default:"0"`
Top int `cli:"top,y"` Top string `cli:"top,y" default:"0"`
Width int `cli:"width,w"` Width string `cli:"width,w" help:"(default: screen size)"`
Height int `cli:"height,h"` Height string `cli:"height,h" help:"(default: screen size)"`
NoRestorable bool `cli:"norestorable"` NoRestorable bool `cli:"norestorable"`
} }
@ -123,16 +126,16 @@ func (c resizeCmd) Run(g globalCmd) {
setWindowPos.Call( setWindowPos.Call(
uintptr(g.targetHandle), uintptr(g.targetHandle),
0, 0,
uintptr(c.Left), uintptr(toInt(c.Left, g.scrWidth)),
uintptr(c.Top), uintptr(toInt(c.Top, g.scrHeight)),
uintptr(c.Width), uintptr(toInt(c.Width, g.scrWidth)),
uintptr(c.Height), uintptr(toInt(c.Height, g.scrHeight)),
SWP_NOACTIVATE|SWP_NOZORDER) SWP_NOACTIVATE|SWP_NOZORDER)
} }
type moveCmd struct { type moveCmd struct {
Left int `cli:"left,x"` Left string `cli:"left,x" default:"0"`
Top int `cli:"top,y"` Top string `cli:"top,y" default:"0"`
NoRestorable bool `cli:"norestorable"` NoRestorable bool `cli:"norestorable"`
} }
@ -148,8 +151,8 @@ func (c moveCmd) Run(g globalCmd) {
setWindowPos.Call( setWindowPos.Call(
uintptr(g.targetHandle), uintptr(g.targetHandle),
0, 0,
uintptr(c.Left), uintptr(toInt(c.Left, g.scrWidth)),
uintptr(c.Top), uintptr(toInt(c.Top, g.scrHeight)),
uintptr(rect.Right-rect.Left), uintptr(rect.Right-rect.Left),
uintptr(rect.Bottom-rect.Top), uintptr(rect.Bottom-rect.Top),
SWP_NOACTIVATE|SWP_NOZORDER) SWP_NOACTIVATE|SWP_NOZORDER)
@ -157,8 +160,8 @@ func (c moveCmd) Run(g globalCmd) {
setWindowPos.Call( setWindowPos.Call(
uintptr(g.targetHandle), uintptr(g.targetHandle),
0, 0,
uintptr(c.Left), uintptr(toInt(c.Left, g.scrWidth)),
uintptr(c.Top), uintptr(toInt(c.Top, g.scrHeight)),
0, 0,
0, 0,
SWP_NOACTIVATE|SWP_NOZORDER|SWP_NOSIZE) SWP_NOACTIVATE|SWP_NOZORDER|SWP_NOSIZE)
@ -200,6 +203,8 @@ const (
SM_CXVIRTUALSCREEN = 78 SM_CXVIRTUALSCREEN = 78
SM_CYVIRTUALSCREEN = 79 SM_CYVIRTUALSCREEN = 79
SM_CXSIZEFRAME = 32
SM_CYSIZEFRAME = 33
) )
type ( type (
@ -276,3 +281,22 @@ func ancestors() []int {
return an return an
} }
func toInt(s string, max int) int {
if strings.HasSuffix(s, "%") {
i, err := strconv.Atoi(s[:len(s)-1])
if err != nil {
return 0
}
if i > 100 {
i = 100
}
return int(math.Trunc(float64(max*i) / 100))
} else {
i, err := strconv.Atoi(s)
if err != nil {
return 0
}
return i
}
}