From a71a6fb3ac484ee05f3f159f60ade5f738cca8c4 Mon Sep 17 00:00:00 2001
From: outfoxxed <outfoxxed@outfoxxed.me>
Date: Wed, 24 Jul 2024 01:18:16 -0700
Subject: [PATCH] core/popupanchor: fix flip with opposite anchors and gravity

Flips into the anchor rect instead of over it when anchors and gravity
are opposite.
---
 src/core/popupanchor.cpp | 50 +++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/core/popupanchor.cpp b/src/core/popupanchor.cpp
index 594ec4af..c0e60ca6 100644
--- a/src/core/popupanchor.cpp
+++ b/src/core/popupanchor.cpp
@@ -12,8 +12,8 @@
 
 bool PopupAnchorState::operator==(const PopupAnchorState& other) const {
 	return this->rect == other.rect && this->edges == other.edges && this->gravity == other.gravity
-			&& this->adjustment == other.adjustment && this->anchorpoint == other.anchorpoint
-			&& this->size == other.size;
+	    && this->adjustment == other.adjustment && this->anchorpoint == other.anchorpoint
+	    && this->size == other.size;
 }
 
 bool PopupAnchor::isDirty() const {
@@ -184,32 +184,34 @@ void PopupPositioner::reposition(PopupAnchor* anchor, QWindow* window, bool only
 	auto effectiveY = calcEffectiveY();
 
 	if (adjustment.testFlag(PopupAdjustment::FlipX)) {
-		if (anchorGravity.testFlag(Edges::Left)) {
-			if (effectiveX < screenGeometry.left()) {
-				anchorGravity = anchorGravity ^ Edges::Left | Edges::Right;
-				anchorX = anchorRectGeometry.right();
-				effectiveX = calcEffectiveX();
-			}
-		} else if (anchorGravity.testFlag(Edges::Right)) {
-			if (effectiveX + windowGeometry.width() > screenGeometry.right()) {
-				anchorGravity = anchorGravity ^ Edges::Right | Edges::Left;
-				anchorX = anchorRectGeometry.left();
-				effectiveX = calcEffectiveX();
-			}
+		bool flip = (anchorGravity.testFlag(Edges::Left) && effectiveX < screenGeometry.left())
+		         || (anchorGravity.testFlag(Edges::Right)
+		             && effectiveX + windowGeometry.width() > screenGeometry.right());
+
+		if (flip) {
+			anchorGravity ^= Edges::Left | Edges::Right;
+
+			anchorX = anchorEdges.testFlags(Edges::Left)  ? anchorRectGeometry.right()
+			        : anchorEdges.testFlags(Edges::Right) ? anchorRectGeometry.left()
+			                                              : anchorX;
+
+			effectiveX = calcEffectiveX();
 		}
 	}
 
 	if (adjustment.testFlag(PopupAdjustment::FlipY)) {
-		if (anchorGravity.testFlag(Edges::Top)) {
-			if (effectiveY < screenGeometry.top()) {
-				anchorGravity = anchorGravity ^ Edges::Top | Edges::Bottom;
-				effectiveY = calcEffectiveY();
-			}
-		} else if (anchorGravity.testFlag(Edges::Bottom)) {
-			if (effectiveY + windowGeometry.height() > screenGeometry.bottom()) {
-				anchorGravity = anchorGravity ^ Edges::Bottom | Edges::Top;
-				effectiveY = calcEffectiveY();
-			}
+		bool flip = (anchorGravity.testFlag(Edges::Top) && effectiveY < screenGeometry.top())
+		         || (anchorGravity.testFlag(Edges::Bottom)
+		             && effectiveY + windowGeometry.height() > screenGeometry.bottom());
+
+		if (flip) {
+			anchorGravity ^= Edges::Top | Edges::Bottom;
+
+			anchorY = anchorEdges.testFlags(Edges::Top)    ? anchorRectGeometry.bottom()
+			        : anchorEdges.testFlags(Edges::Bottom) ? anchorRectGeometry.top()
+			                                               : anchorY;
+
+			effectiveY = calcEffectiveY();
 		}
 	}