From fc5a7fbff05a22f06176fd15cd6904ba99553a5f Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 7 May 2019 12:38:53 +0200 Subject: ui: remove a few DPI hacks --- ui/logpage.go | 2 +- ui/managewindow.go | 2 +- ui/tunnelspage.go | 10 +++------- 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() -- cgit v1.2.3-59-g8ed1b