commit a4d524e

delthas  ·  2024-07-18 09:21:57 +0000 UTC
parent 6bb73eb
Fix mouse cursor shape when resizing panels
2 files changed,  +16, -10
M app.go
M app.go
+10, -10
 1@@ -530,6 +530,14 @@ func (app *App) handleMouseEvent(ev vaxis.Mouse) {
 2 		return
 3 	}
 4 
 5+	if ev.Button == vaxis.MouseLeftButton && (ev.EventType == vaxis.EventRelease || ev.EventType == vaxis.EventMotion) {
 6+		if app.win.ChannelColClicked() {
 7+			app.win.ResizeChannelCol(x + 1)
 8+		} else if app.win.MemberColClicked() {
 9+			app.win.ResizeMemberCol(w - x)
10+		}
11+	}
12+
13 	if ev.EventType == vaxis.EventPress {
14 		if ev.Button == vaxis.MouseWheelUp {
15 			if x < app.win.ChannelWidth() || (app.win.ChannelWidth() == 0 && y == h-1) {
16@@ -550,11 +558,7 @@ func (app *App) handleMouseEvent(ev vaxis.Mouse) {
17 			}
18 		}
19 		if ev.Button == vaxis.MouseLeftButton {
20-			if app.win.ChannelColClicked() {
21-				app.win.ResizeChannelCol(x + 1)
22-			} else if app.win.MemberColClicked() {
23-				app.win.ResizeMemberCol(w - x)
24-			} else if x == app.win.ChannelWidth()-1 {
25+			if x == app.win.ChannelWidth()-1 {
26 				app.win.ClickChannelCol(true)
27 				app.win.SetMouseShape(vaxis.MouseShapeResizeHorizontal)
28 			} else if x < app.win.ChannelWidth() {
29@@ -662,11 +666,7 @@ func (app *App) handleMouseEvent(ev vaxis.Mouse) {
30 		app.win.ClickMember(-1)
31 		app.win.ClickChannelCol(false)
32 		app.win.ClickMemberCol(false)
33-		if x == app.win.ChannelWidth()-1 || x == w-app.win.MemberWidth() {
34-			app.win.SetMouseShape(vaxis.MouseShapeResizeHorizontal)
35-		} else {
36-			app.win.SetMouseShape(vaxis.MouseShapeDefault)
37-		}
38+		app.win.SetMouseShape(vaxis.MouseShapeDefault)
39 	}
40 }
41 
+6, -0
 1@@ -191,6 +191,9 @@ func (ui *UI) ResizeChannelCol(x int) {
 2 	} else if x > 24 {
 3 		x = 24
 4 	}
 5+	if ui.channelWidth == x {
 6+		return
 7+	}
 8 	ui.channelWidth = x
 9 	ui.Resize()
10 }
11@@ -209,6 +212,9 @@ func (ui *UI) ResizeMemberCol(x int) {
12 	} else if x > 24 {
13 		x = 24
14 	}
15+	if ui.memberWidth == x {
16+		return
17+	}
18 	ui.memberWidth = x
19 	ui.Resize()
20 }