aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ui
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-05-07 12:38:53 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2019-05-08 08:31:00 +0200
commit92e65d3818f35afc9db1637c6d35e7e9982d0cc8 (patch)
tree4d6b6e073b8b9d47a7f853bb3f26db0d3576ef64 /ui
parentattacksurface: update with latest info (diff)
downloadwireguard-windows-92e65d3818f35afc9db1637c6d35e7e9982d0cc8.tar.xz
wireguard-windows-92e65d3818f35afc9db1637c6d35e7e9982d0cc8.zip
ui: remove a few DPI hacks
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'ui')
-rw-r--r--ui/logpage.go2
-rw-r--r--ui/managewindow.go2
-rw-r--r--ui/tunnelspage.go10
3 files changed, 5 insertions, 9 deletions
diff --git a/ui/logpage.go b/ui/logpage.go
index 6aa22698..dc0d9ef9 100644
--- a/ui/logpage.go
+++ b/ui/logpage.go
@@ -76,7 +76,7 @@ func NewLogPage() (*LogPage, error) {
stampCol.SetName("Stamp")
stampCol.SetTitle("Time")
stampCol.SetFormat("2006-01-02 15:04:05.000")
- stampCol.SetWidth(150)
+ stampCol.SetWidth(140)
lp.logView.Columns().Add(stampCol)
msgCol := walk.NewTableViewColumn()
diff --git a/ui/managewindow.go b/ui/managewindow.go
index b8a34c3a..6d8c9701 100644
--- a/ui/managewindow.go
+++ b/ui/managewindow.go
@@ -44,7 +44,7 @@ func NewManageTunnelsWindow() (*ManageTunnelsWindow, error) {
}
mtw.AddDisposable(font)
mtw.SetFont(font)
- mtw.SetSize(walk.Size{mtw.DPI() * 27 / 4, mtw.DPI() * 5}) //TODO: calculate DPI dynamically
+ mtw.SetSize(walk.Size{640, 480})
vlayout := walk.NewVBoxLayout()
vlayout.SetMargins(walk.Margins{5, 5, 5, 5})
mtw.SetLayout(vlayout)
diff --git a/ui/tunnelspage.go b/ui/tunnelspage.go
index c2521a6b..de7560c4 100644
--- a/ui/tunnelspage.go
+++ b/ui/tunnelspage.go
@@ -9,7 +9,6 @@ import (
"archive/zip"
"fmt"
"github.com/lxn/walk"
- "github.com/lxn/win"
"golang.zx2c4.com/wireguard/windows/conf"
"golang.zx2c4.com/wireguard/windows/service"
"io/ioutil"
@@ -17,7 +16,6 @@ import (
"path/filepath"
"sort"
"strings"
- "unsafe"
)
type TunnelsPage struct {
@@ -72,8 +70,7 @@ func NewTunnelsPage() (*TunnelsPage, error) {
hlayout.SetMargins(walk.Margins{})
tp.fillerContainer.SetLayout(hlayout)
tp.fillerButton, _ = walk.NewPushButton(tp.fillerContainer)
- buttonWidth := tp.DPI() * 2 //TODO: Use dynamic DPI
- tp.fillerButton.SetMinMaxSize(walk.Size{buttonWidth, 0}, walk.Size{buttonWidth, 0})
+ tp.fillerButton.SetMinMaxSize(walk.Size{200, 0}, walk.Size{200, 0})
tp.fillerButton.Clicked().Attach(func() {
if tp.fillerHandler != nil {
tp.fillerHandler()
@@ -175,9 +172,8 @@ func (tp *TunnelsPage) CreateToolbar() {
exportAction.Triggered().Attach(tp.onExportTunnels)
tp.listToolbar.Actions().Add(exportAction)
- var size win.SIZE
- tp.listToolbar.SendMessage(win.TB_GETIDEALSIZE, win.FALSE, uintptr(unsafe.Pointer(&size)))
- tp.listContainer.SetMinMaxSize(walk.Size{int(size.CX), 0}, walk.Size{int(size.CX), 0})
+ toolbarWidth := tp.listToolbar.SizeHint().Width
+ tp.listContainer.SetMinMaxSizePixels(walk.Size{toolbarWidth, 0}, walk.Size{toolbarWidth, 0})
contextMenu, _ := walk.NewMenu()
toggleAction := walk.NewAction()