From: Arkadiy Illarionov <qarkai@gmail.com>
Date: Thu, 16 May 2024 18:33:29 +0000 (+0300)
Subject: Use util_clip_triangle() in pan_item_tri_new()
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=refs%2Fheads%2Fmaster;ds=sidebyside

Use util_clip_triangle() in pan_item_tri_new()

Remove unused parameters in pan_item_tri_new().
---

diff --git a/src/pan-view/pan-calendar.cc b/src/pan-view/pan-calendar.cc
index e3faa61f..e2a8bbad 100644
--- a/src/pan-view/pan-calendar.cc
+++ b/src/pan-view/pan-calendar.cc
@@ -88,8 +88,6 @@ void pan_calendar_update(PanWindow *pw, PanItem *pi_day)
 	gint y3;
 	gint x;
 	gint y;
-	gint w;
-	gint h;
 	gint grid;
 	gint column;
 
@@ -187,12 +185,10 @@ void pan_calendar_update(PanWindow *pw, PanItem *pi_day)
 	y2 = pbox->y + MIN(42, pbox->height);
 	x3 = pbox->x + 1;
 	y3 = MAX(pbox->y, y2 - 30);
-	util_clip_triangle(x1, y1, x2, y2, x3, y3,
-	                   x, y, w, h);
 
-	pi = pan_item_tri_new(pw, nullptr, x, y, w, h,
-			      x1, y1, x2, y2, x3, y3,
-			      PAN_CAL_POPUP_COLOR);
+	pi = pan_item_tri_new(pw,
+	                      x1, y1, x2, y2, x3, y3,
+	                      PAN_CAL_POPUP_COLOR);
 	pan_item_tri_border(pi, PAN_BORDER_1 | PAN_BORDER_3, PAN_CAL_POPUP_BORDER_COLOR);
 	pan_item_set_key(pi, "day_bubble");
 	pan_item_added(pw, pi);
diff --git a/src/pan-view/pan-folder.cc b/src/pan-view/pan-folder.cc
index 9e3eff30..65485fe3 100644
--- a/src/pan-view/pan-folder.cc
+++ b/src/pan-view/pan-folder.cc
@@ -183,10 +183,6 @@ static void pan_flower_build(PanWindow *pw, FlowerGroup *group, FlowerGroup *par
 		gint py;
 		gint gx;
 		gint gy;
-		gint x1;
-		gint y1;
-		gint x2;
-		gint y2;
 
 		px = parent->x + parent->width / 2;
 		py = parent->y + parent->height / 2;
@@ -194,15 +190,9 @@ static void pan_flower_build(PanWindow *pw, FlowerGroup *group, FlowerGroup *par
 		gx = group->x + group->width / 2;
 		gy = group->y + group->height / 2;
 
-		x1 = MIN(px, gx);
-		y1 = MIN(py, gy);
-
-		x2 = MAX(px, gx + 5);
-		y2 = MAX(py, gy + 5);
-
-		pi = pan_item_tri_new(pw, nullptr, x1, y1, x2 - x1, y2 - y1,
-				      px, py, gx, gy, gx + 5, gy + 5,
-				      {255, 40, 40, 128});
+		pi = pan_item_tri_new(pw,
+		                      px, py, gx, gy, gx + 5, gy + 5,
+		                      {255, 40, 40, 128});
 		pan_item_tri_border(pi, PAN_BORDER_1 | PAN_BORDER_3, {255, 0, 0, 128});
 		}
 
diff --git a/src/pan-view/pan-item.cc b/src/pan-view/pan-item.cc
index 4a10b8e4..0b4d9d46 100644
--- a/src/pan-view/pan-item.cc
+++ b/src/pan-view/pan-item.cc
@@ -269,7 +269,7 @@ gint pan_item_box_draw(PanWindow *, PanItem *pi, GdkPixbuf *pixbuf, PixbufRender
  *-----------------------------------------------------------------------------
  */
 
-PanItem *pan_item_tri_new(PanWindow *pw, FileData *, gint x, gint y, gint width, gint height,
+PanItem *pan_item_tri_new(PanWindow *pw,
                           gint x1, gint y1, gint x2, gint y2, gint x3, gint y3,
                           const PanColor &color)
 {
@@ -278,13 +278,11 @@ PanItem *pan_item_tri_new(PanWindow *pw, FileData *, gint x, gint y, gint width,
 
 	pi = g_new0(PanItem, 1);
 	pi->type = PAN_ITEM_TRIANGLE;
-	pi->x = x;
-	pi->y = y;
-	pi->width = width;
-	pi->height = height;
-
 	pi->color = color;
 
+	util_clip_triangle(x1, y1, x2, y2, x3, y3,
+	                   pi->x, pi->y, pi->width, pi->height);
+
 	coord = g_new0(gint, 6);
 	coord[0] = x1;
 	coord[1] = y1;
diff --git a/src/pan-view/pan-item.h b/src/pan-view/pan-item.h
index ec43470f..fba146ad 100644
--- a/src/pan-view/pan-item.h
+++ b/src/pan-view/pan-item.h
@@ -57,7 +57,7 @@ gint pan_item_box_draw(PanWindow *pw, PanItem *pi, GdkPixbuf *pixbuf, PixbufRend
 		       gint x, gint y, gint width, gint height);
 
 // Item triangle type
-PanItem *pan_item_tri_new(PanWindow *pw, FileData *fd, gint x, gint y, gint width, gint height,
+PanItem *pan_item_tri_new(PanWindow *pw,
                           gint x1, gint y1, gint x2, gint y2, gint x3, gint y3,
                           const PanColor &color);
 void pan_item_tri_border(PanItem *pi, gint borders, const PanColor &color);
diff --git a/src/pan-view/pan-view.cc b/src/pan-view/pan-view.cc
index ef9acc11..0a256e04 100644
--- a/src/pan-view/pan-view.cc
+++ b/src/pan-view/pan-view.cc
@@ -1410,10 +1410,6 @@ void pan_info_update(PanWindow *pw, PanItem *pi)
 	gint y2;
 	gint x3;
 	gint y3;
-	gint x;
-	gint y;
-	gint w;
-	gint h;
 
 	if (pw->click_pi == pi) return;
 	if (pi && !pi->fd) pi = nullptr;
@@ -1431,8 +1427,8 @@ void pan_info_update(PanWindow *pw, PanItem *pi)
 
 	if (pi->type == PAN_ITEM_THUMB && pi->pixbuf)
 		{
-		w = gdk_pixbuf_get_width(pi->pixbuf);
-		h = gdk_pixbuf_get_height(pi->pixbuf);
+		gint w = gdk_pixbuf_get_width(pi->pixbuf);
+		gint h = gdk_pixbuf_get_height(pi->pixbuf);
 
 		x1 = pi->x + pi->width - (pi->width - w) / 2 - 8;
 		y1 = pi->y + (pi->height - h) / 2 + 8;
@@ -1447,12 +1443,10 @@ void pan_info_update(PanWindow *pw, PanItem *pi)
 	y2 = pbox->y + 36;
 	x3 = pbox->x + 1;
 	y3 = pbox->y + 12;
-	util_clip_triangle(x1, y1, x2, y2, x3, y3,
-	                   x, y, w, h);
 
-	p = pan_item_tri_new(pw, nullptr, x, y, w, h,
-			     x1, y1, x2, y2, x3, y3,
-			     PAN_POPUP_COLOR);
+	p = pan_item_tri_new(pw,
+	                     x1, y1, x2, y2, x3, y3,
+	                     PAN_POPUP_COLOR);
 	pan_item_tri_border(p, PAN_BORDER_1 | PAN_BORDER_3, PAN_POPUP_BORDER_COLOR);
 	pan_item_set_key(p, "info");
 	pan_item_added(pw, p);