Merge pull request #48 from Jarod42/mixed_or_and_fix

Mixed or and fix
kallisti5 · Aug 22, 2024 · d1a0b35 · d1a0b35
2 parents 543fe48 + 661c744
commit d1a0b35
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/TODO b/TODO
@@ -1,4 +1,4 @@
-* Continue rebasing from ba5109fdd43281372247cf4259c5cf19376271ce
+* Continue rebasing from a813cccba0894a7a027212409dc949c95409a792
 * Add a focus listener interface.
 * Make focus apply synchronously.
 * Graphics and input objects for DirectX.

diff --git a/src/gui.cpp b/src/gui.cpp
@@ -519,8 +519,7 @@ namespace gcn
         int sourceWidgetX, sourceWidgetY;
         sourceWidget->getAbsolutePosition(sourceWidgetX, sourceWidgetY);
 
-        if (mFocusHandler->getModalFocused() != NULL
-            && sourceWidget->isModalFocused()
+        if ((mFocusHandler->getModalFocused() != NULL && sourceWidget->isModalFocused())
             || mFocusHandler->getModalFocused() == NULL)
         {
             sourceWidget->requestFocus();

diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp
@@ -354,12 +354,9 @@ namespace gcn
         }
 
         // Released outside of widget. Can happen when we have modal input focus.
-        if (0 > mouseEvent.getY()
-            || mouseEvent.getY() >= getHeight()
-            || mouseEvent.getX() < 0
-            || mouseEvent.getX() >= getWidth()
-            && mouseEvent.getButton() == MouseEvent::LEFT
-            && isModalMouseInputFocused())
+        if ((0 > mouseEvent.getY() || mouseEvent.getY() >= getHeight() || mouseEvent.getX() < 0
+             || mouseEvent.getX() >= getWidth())
+            && mouseEvent.getButton() == MouseEvent::LEFT && isModalMouseInputFocused())
         {
             releaseModalMouseInputFocus();