Merge pull request #130 from markusressel/feature/window-resizing

Real-Time Mouse-Based Window Resizing

Author: markusressel

internal/ui/dataset_info/dataset_info.go

@@ -212,6 +212,13 @@ func (datasetInfo *DatasetInfoComponent) GetLayout() *uiutil.LoadingContainer {
 	return datasetInfo.container
 }
 
+func (datasetInfo *DatasetInfoComponent) SetBorderColor(color tcell.Color) {
+	datasetInfo.textView.SetBorderColor(color)
+	if datasetInfo.container != nil {
+		datasetInfo.container.SetBorderColor(color)
+	}
+}
+
 func (datasetInfo *DatasetInfoComponent) CreateSnapshot(name string) error {
 	if datasetInfo.dataset == nil {
 		return fmt.Errorf("no dataset selected")

internal/ui/file_browser/file_browser.go

@@ -888,6 +888,12 @@ func (fileBrowser *FileBrowserComponent) GetLayout() tview.Primitive {
 	return fileBrowser.layout
 }
 
+func (fileBrowser *FileBrowserComponent) SetBorderColor(color tcell.Color) {
+	if flex, ok := fileBrowser.tableContainer.GetLayout().(*tview.Flex); ok {
+		flex.SetBorderColor(color)
+	}
+}
+
 func (fileBrowser *FileBrowserComponent) SelectHeader() {
 	fileBrowser.tableContainer.SelectHeader()
 }

internal/ui/main_page.go

@@ -2,19 +2,37 @@ package ui
 
 import (
 	"fmt"
+	"time"
 	"zfs-file-history/internal/logging"
 	"zfs-file-history/internal/ui/dataset_info"
 	"zfs-file-history/internal/ui/file_browser"
 	"zfs-file-history/internal/ui/shortcut_helper"
 	"zfs-file-history/internal/ui/snapshot_browser"
 	"zfs-file-history/internal/ui/status_message"
+	"zfs-file-history/internal/ui/theme"
 	uiutil "zfs-file-history/internal/ui/util"
 	"zfs-file-history/internal/zfs"
 
 	"github.com/gdamore/tcell/v2"
 	"github.com/rivo/tview"
 )
 
+type dragType int
+
+const (
+	dragNone dragType = iota
+	dragVertical
+	dragHorizontal
+)
+
+type boundaryType int
+
+const (
+	boundaryNone boundaryType = iota
+	boundaryVertical
+	boundaryHorizontal
+)
+
 type MainPage struct {
 	application     *tview.Application
 	header          *ApplicationHeaderComponent
@@ -23,8 +41,16 @@ type MainPage struct {
 	datasetInfo     *dataset_info.DatasetInfoComponent
 	snapshotBrowser *snapshot_browser.SnapshotBrowserComponent
 	layout          *tview.Flex
+	windowLayout    *tview.Flex
+	infoLayout      *tview.Flex
 
 	wasInitialized bool
+
+	isDragging      bool
+	dragType        dragType
+	hoveredBoundary boundaryType
+	lastDragRedraw  time.Time
+	dragTimer       *time.Timer
 }
 
 func NewMainPage(application *tview.Application, path string) *MainPage {
@@ -143,6 +169,140 @@ func (mainPage *MainPage) createLayout() *tview.Flex {
 
 	mainPageLayout.AddItem(windowLayout, 0, 1, true)
 
+	mainPage.windowLayout = windowLayout
+	mainPage.infoLayout = infoLayout
+
+	// Set mouse capture on the top-level layout to capture drags anywhere on the screen
+	mainPageLayout.SetMouseCapture(func(action tview.MouseAction, event *tcell.EventMouse) (tview.MouseAction, *tcell.EventMouse) {
+		mouseX, mouseY := event.Position()
+		buttons := event.Buttons()
+
+		diX, diY, diW, diH := mainPage.datasetInfo.GetLayout().GetRect()
+		_, sbY, _, sbH := mainPage.snapshotBrowser.GetLayout().GetRect()
+		winX, _, winW, _ := windowLayout.GetRect()
+
+		// 1. If currently dragging
+		if mainPage.isDragging {
+			if buttons == tcell.ButtonNone || action == tview.MouseLeftUp {
+				mainPage.isDragging = false
+				mainPage.dragType = dragNone
+				mainPage.hoveredBoundary = boundaryNone
+				if mainPage.dragTimer != nil {
+					mainPage.dragTimer.Stop()
+					mainPage.dragTimer = nil
+				}
+				mainPage.updateBorderHighlights()
+				return tview.MouseConsumed, nil
+			}
+
+			// Rate limit updates to 30ms to prevent redraw flooding/input lag
+			now := time.Now()
+			if now.Sub(mainPage.lastDragRedraw) > 30*time.Millisecond {
+				mainPage.lastDragRedraw = now
+				if mainPage.dragTimer != nil {
+					mainPage.dragTimer.Stop()
+					mainPage.dragTimer = nil
+				}
+				mainPage.applyResize(mouseX, mouseY, winX, winW, diY, diH, sbY, sbH)
+				return tview.MouseConsumed, nil
+			} else {
+				// Schedule a trailing redraw for the final drag position
+				if mainPage.dragTimer != nil {
+					mainPage.dragTimer.Stop()
+				}
+				mainPage.dragTimer = time.AfterFunc(30*time.Millisecond, func() {
+					mainPage.application.QueueUpdateDraw(func() {
+						mainPage.applyResize(mouseX, mouseY, winX, winW, diY, diH, sbY, sbH)
+					})
+				})
+				return action, nil // consume event for children but do not trigger immediate screen redraw
+			}
+		}
+
+		// 2. Not dragging: detect hover boundaries
+		isOnVertical := false
+		if mouseY >= diY && mouseY < sbY+sbH {
+			if mouseX == diX || mouseX == diX-1 {
+				isOnVertical = true
+			}
+		}
+
+		isOnHorizontal := false
+		if mouseX >= diX && mouseX < diX+diW {
+			if mouseY == sbY || mouseY == sbY-1 {
+				isOnHorizontal = true
+			}
+		}
+
+		newHover := boundaryNone
+		if isOnHorizontal {
+			newHover = boundaryHorizontal
+		} else if isOnVertical {
+			newHover = boundaryVertical
+		}
+
+		if newHover != mainPage.hoveredBoundary {
+			mainPage.hoveredBoundary = newHover
+			mainPage.updateBorderHighlights()
+			return tview.MouseConsumed, nil
+		}
+
+		// 3. Initiate dragging
+		if buttons&tcell.Button1 != 0 && action == tview.MouseLeftDown {
+			if isOnHorizontal {
+				mainPage.isDragging = true
+				mainPage.dragType = dragHorizontal
+				mainPage.lastDragRedraw = time.Now()
+				return tview.MouseConsumed, nil
+			} else if isOnVertical {
+				mainPage.isDragging = true
+				mainPage.dragType = dragVertical
+				mainPage.lastDragRedraw = time.Now()
+				return tview.MouseConsumed, nil
+			}
+		}
+
+		return action, event
+	})
+
+	// Configure drawing of highlighted adjacent borders after the screen draws
+	mainPage.application.SetAfterDrawFunc(func(screen tcell.Screen) {
+		// Highlight vertical boundary adjacent line segment
+		if mainPage.hoveredBoundary == boundaryVertical || (mainPage.isDragging && mainPage.dragType == dragVertical) {
+			_, diY, _, _ := mainPage.datasetInfo.GetLayout().GetRect()
+			diX, _, diW, _ := mainPage.datasetInfo.GetLayout().GetRect()
+			_, sbY, _, sbH := mainPage.snapshotBrowser.GetLayout().GetRect()
+
+			if diW > 0 && sbH > 0 {
+				highlightColor := theme.Primary
+				for y := diY; y < sbY+sbH; y++ {
+					for _, x := range []int{diX - 1, diX} {
+						primary, combining, style, _ := screen.GetContent(x, y)
+						newStyle := style.Foreground(highlightColor)
+						screen.SetContent(x, y, primary, combining, newStyle)
+					}
+				}
+			}
+		}
+
+		// Highlight horizontal boundary adjacent line segment
+		if mainPage.hoveredBoundary == boundaryHorizontal || (mainPage.isDragging && mainPage.dragType == dragHorizontal) {
+			diX, _, diW, _ := mainPage.datasetInfo.GetLayout().GetRect()
+			_, sbY, _, sbH := mainPage.snapshotBrowser.GetLayout().GetRect()
+
+			if diW > 0 && sbH > 0 {
+				highlightColor := theme.Primary
+				for x := diX; x < diX+diW; x++ {
+					for _, y := range []int{sbY - 1, sbY} {
+						primary, combining, style, _ := screen.GetContent(x, y)
+						newStyle := style.Foreground(highlightColor)
+						screen.SetContent(x, y, primary, combining, newStyle)
+					}
+				}
+			}
+		}
+	})
+
 	mainPage.header = header
 
 	shortcutMap := shortcut_helper.NewShortcutMap(mainPage.application)
@@ -218,3 +378,40 @@ func (mainPage *MainPage) updateShortcutMap(component FocusableUiComponent) {
 		mainPage.clearShortcutMap()
 	}
 }
+
+func (mainPage *MainPage) updateBorderHighlights() {
+	// Redraw logic is handled by SetAfterDrawFunc based on the hoveredBoundary/isDragging states.
+}
+
+func (mainPage *MainPage) applyResize(mouseX, mouseY, winX, winW, diY, diH, sbY, sbH int) {
+	if mainPage.dragType == dragVertical {
+		newLeftWidth := mouseX - winX
+		minWidth := 10
+		if newLeftWidth < minWidth {
+			newLeftWidth = minWidth
+		}
+		if newLeftWidth > winW-minWidth {
+			newLeftWidth = winW - minWidth
+		}
+		newRightWidth := winW - newLeftWidth
+
+		mainPage.windowLayout.ResizeItem(mainPage.fileBrowser.GetLayout(), 0, newLeftWidth)
+		mainPage.windowLayout.ResizeItem(mainPage.infoLayout, 0, newRightWidth)
+	} else if mainPage.dragType == dragHorizontal {
+		infoH := diH + sbH
+		infoY := diY
+		newTopHeight := mouseY - infoY
+		minTopHeight := 4
+		minBottomHeight := 5
+		if newTopHeight < minTopHeight {
+			newTopHeight = minTopHeight
+		}
+		if newTopHeight > infoH-minBottomHeight {
+			newTopHeight = infoH - minBottomHeight
+		}
+		newBottomHeight := infoH - newTopHeight
+
+		mainPage.infoLayout.ResizeItem(mainPage.datasetInfo.GetLayout(), 0, newTopHeight)
+		mainPage.infoLayout.ResizeItem(mainPage.snapshotBrowser.GetLayout(), 0, newBottomHeight)
+	}
+}

internal/ui/snapshot_browser/snapshot_browser.go

@@ -202,6 +202,15 @@ func (snapshotBrowser *SnapshotBrowserComponent) GetLayout() *uiutil.LoadingCont
 	return snapshotBrowser.container
 }
 
+func (snapshotBrowser *SnapshotBrowserComponent) SetBorderColor(color tcell.Color) {
+	if flex, ok := snapshotBrowser.tableContainer.GetLayout().(*tview.Flex); ok {
+		flex.SetBorderColor(color)
+	}
+	if snapshotBrowser.container != nil {
+		snapshotBrowser.container.SetBorderColor(color)
+	}
+}
+
 func (snapshotBrowser *SnapshotBrowserComponent) SetPath(path string, force bool) {
 	if !force && snapshotBrowser.path == path {
 		return

internal/ui/util/data_loader.go

@@ -5,6 +5,7 @@ import (
 	"sync"
 	"sync/atomic"
 
+	"github.com/gdamore/tcell/v2"
 	"github.com/rivo/tview"
 )
 
@@ -112,3 +113,16 @@ func (c *LoadingContainer) SetIsLoading(isLoading bool) {
 func (c *LoadingContainer) GetFrontPage() (string, tview.Primitive) {
 	return c.Pages.GetFrontPage()
 }
+
+func (c *LoadingContainer) SetBorderColor(color tcell.Color) {
+	if c.loadingView != nil {
+		c.loadingView.SetBorderColor(color)
+	}
+	if c.content != nil {
+		if box, ok := c.content.(interface{ SetBorderColor(tcell.Color) *tview.Box }); ok {
+			box.SetBorderColor(color)
+		} else if flex, ok := c.content.(*tview.Flex); ok {
+			flex.SetBorderColor(color)
+		}
+	}
+}