From 6f8f5f080cba28038e2201fb1068311742ccd95c Mon Sep 17 00:00:00 2001
From: sqshq <sqshq@sqshq.com>
Date: Mon, 15 Apr 2019 22:12:10 -0400
Subject: [PATCH] refactoring: extract common logic into a separate method

---
 component/layout/layout.go | 57 ++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 33 deletions(-)

diff --git a/component/layout/layout.go b/component/layout/layout.go
index 9eeab1c..569c270 100644
--- a/component/layout/layout.go
+++ b/component/layout/layout.go
@@ -275,21 +275,8 @@ func (l *Layout) Draw(buffer *ui.Buffer) {
 	rowHeight := float64(l.GetRect().Dy()-statusbarHeight) / float64(rowsCount)
 
 	for _, c := range l.Components {
-
-		x1 := math.Floor(float64(c.Location.X) * columnWidth)
-		y1 := math.Floor(float64(c.Location.Y) * rowHeight)
-		x2 := x1 + math.Floor(float64(c.Size.X))*columnWidth
-		y2 := y1 + math.Floor(float64(c.Size.Y))*rowHeight
-
-		if x2-x1 < minDimension {
-			x2 = x1 + minDimension
-		}
-
-		if y2-y1 < minDimension {
-			y2 = y1 + minDimension
-		}
-
-		c.SetRect(int(x1), int(y1), int(x2), int(y2))
+		rectangle := calculateComponentCoordinates(c, columnWidth, rowHeight)
+		c.SetRect(rectangle.Min.X, rectangle.Min.Y, rectangle.Max.X, rectangle.Max.Y)
 		c.Draw(buffer)
 	}
 
@@ -301,7 +288,6 @@ func (l *Layout) Draw(buffer *ui.Buffer) {
 	l.menu.Draw(buffer)
 }
 
-// TODO extract x/y calculation to a separate method
 func (l *Layout) findComponentAtPoint(point image.Point) (*component.Component, int) {
 
 	columnWidth := float64(l.GetRect().Dx()) / float64(columnsCount)
@@ -309,23 +295,7 @@ func (l *Layout) findComponentAtPoint(point image.Point) (*component.Component,
 
 	for i, c := range l.Components {
 
-		x1 := math.Floor(float64(c.Location.X) * columnWidth)
-		y1 := math.Floor(float64(c.Location.Y) * rowHeight)
-		x2 := x1 + math.Floor(float64(c.Size.X))*columnWidth
-		y2 := y1 + math.Floor(float64(c.Size.Y))*rowHeight
-
-		if x2-x1 < minDimension {
-			x2 = x1 + minDimension
-		}
-
-		if y2-y1 < minDimension {
-			y2 = y1 + minDimension
-		}
-
-		rectangle := image.Rectangle{Min: image.Point{
-			X: int(x1), Y: int(y1)},
-			Max: image.Point{X: int(x2), Y: int(y2)},
-		}
+		rectangle := calculateComponentCoordinates(c, columnWidth, rowHeight)
 
 		if point.In(rectangle) {
 			return c, i
@@ -335,6 +305,27 @@ func (l *Layout) findComponentAtPoint(point image.Point) (*component.Component,
 	return nil, -1
 }
 
+func calculateComponentCoordinates(c *component.Component, columnWidth float64, rowHeight float64) image.Rectangle {
+
+	x1 := math.Floor(float64(c.Location.X) * columnWidth)
+	y1 := math.Floor(float64(c.Location.Y) * rowHeight)
+	x2 := x1 + math.Floor(float64(c.Size.X))*columnWidth
+	y2 := y1 + math.Floor(float64(c.Size.Y))*rowHeight
+
+	if x2-x1 < minDimension {
+		x2 = x1 + minDimension
+	}
+
+	if y2-y1 < minDimension {
+		y2 = y1 + minDimension
+	}
+
+	return image.Rectangle{Min: image.Point{
+		X: int(x1), Y: int(y1)},
+		Max: image.Point{X: int(x2), Y: int(y2)},
+	}
+}
+
 func (l *Layout) resetAlerts() {
 	for _, c := range l.Components {
 		c.AlertChannel <- nil