diff options
Diffstat (limited to 'libnotify.go')
| -rw-r--r-- | libnotify.go | 56 |
1 files changed, 24 insertions, 32 deletions
diff --git a/libnotify.go b/libnotify.go index 679d2ba..8e282d5 100644 --- a/libnotify.go +++ b/libnotify.go @@ -207,15 +207,14 @@ func hardDrawUnderMouse(tk *guiWidget, name string) { tk.Hide() } w, h := me.baseGui.MousePosition() - a := w - b := h - c := w + 8 - d := h + 4 - var err error - tk.v, err = me.baseGui.SetView(tk.cuiName, a, b, c, d, 0) - if err == nil { - log.Info("hardDrawUnderMouse() err ok widget", tk.cuiName) - tk.dumpWidget("hard draw err") + r := new(rectType) + r.w0 = w + r.h0 = h + r.w1 = w + 8 + r.h1 = h + 4 + if err := tk.SetViewRect(r); err != nil { + log.Info("hardDrawUnderMouse() err", tk.cuiName, err) + tk.dumpWidget("hardDrawERR") } tk.v.Frame = false tk.v.Clear() @@ -226,20 +225,14 @@ func hardDrawAtgocuiSize(tk *guiWidget) { if tk.v != nil { tk.Hide() } - a := tk.gocuiSize.w0 - b := tk.gocuiSize.h0 - c := tk.gocuiSize.w1 - d := tk.gocuiSize.h1 - var err error - tk.v, err = me.baseGui.SetView(tk.cuiName, a, b, c, d, 0) - if err == nil { + if err := tk.SetView(); err != nil { log.Info("hardDrawAtgocuiSize() err ok widget", tk.cuiName) - tk.dumpWidget("hard draw err") + tk.dumpWidget("hardDrawERR") } tk.v.Frame = false tk.v.Clear() tk.v.WriteString(tk.labelN) - log.Verbose("hardDrawAtgocuiSize() err ok widget", tk.cuiName, a, b, c, d, tk.v.Name()) + // log.Verbose("hardDrawAtgocuiSize() err ok widget", tk.cuiName, a, b, c, d, tk.v.Name()) } func sigWinchIcon() { @@ -252,20 +245,15 @@ func sigWinchIcon() { func sigWinchBG() { tk := me.BG.tk w, h := me.baseGui.Size() - a := -1 - b := -1 - c := w + 1 - d := h + 1 - var err error - tk.v, err = me.baseGui.SetView(tk.cuiName, a, b, c, d, 0) - if err == nil { - if tk.v == nil { - tk.dumpWidget("drawView() err") - log.Log(ERROR, "drawView() internal plugin error err = nil") - } - return + tk.gocuiSize.w0 = -1 + tk.gocuiSize.h0 = -1 + tk.gocuiSize.w1 = w + 1 + tk.gocuiSize.h1 = h + 1 + if err := tk.SetView(); err != nil { + tk.dumpWidget("sigWinchBGerr()") + log.Log(ERROR, "sigWinchBG()", err) } - log.Log(INFO, "background resized to", a, b, c, d) + log.Log(INFO, "background resized to", tk.gocuiSize) } // find the "BG" widget and set it to the background on the very very bottom @@ -288,5 +276,9 @@ func setBottomBG() { tk.v.Clear() me.baseGui.SetViewOnBottom(tk.cuiName) w, h := me.baseGui.Size() - me.baseGui.SetView(tk.cuiName, -1, -1, w+1, h+1, 0) + tk.gocuiSize.w0 = -1 + tk.gocuiSize.h0 = -1 + tk.gocuiSize.w1 = w + 1 + tk.gocuiSize.h1 = h + 1 + tk.SetView() } |
