partial

Author: DerekGooding

scripts/semantic_review.py

@@ -15,46 +15,63 @@ def detect_collisions(buttons, elements):
 
     # 1. Check if Text overflows its likely container (Button or Panel)
     for t in text_elements:
+        tb = t['Bounds']
+        # Skip empty text
+        if tb['Width'] == 0 or tb['Height'] == 0: continue
+        
         found_container = False
-        # Check buttons first
+        potential_overflow = None
+
+        # Check buttons
         for b in buttons:
-            if is_contained(t['Bounds'], b['Bounds']):
-                found_container = True
-                break
-            # If it overlaps but isn't contained, it might be an overflow
-            if (t['Bounds']['X'] < b['Bounds']['X'] + b['Bounds']['Width'] and
-                t['Bounds']['X'] + t['Bounds']['Width'] > b['Bounds']['X'] and
-                t['Bounds']['Y'] < b['Bounds']['Y'] + b['Bounds']['Height'] and
-                t['Bounds']['Y'] + t['Bounds']['Height'] > b['Bounds']['Y']):
-                # It overlaps! Is it too large?
-                if t['Bounds']['Width'] > b['Bounds']['Width'] or t['Bounds']['Height'] > b['Bounds']['Height']:
-                    collisions.append(f"Text '{t['Text']}' overflows Button '{b.get('Text', 'Unknown')}'")
-                found_container = True # We consider this its container even if it overflows
-                break
+            bb = b['Bounds']
+            # If they overlap at all
+            if (tb['X'] < bb['X'] + bb['Width'] and
+                tb['X'] + tb['Width'] > bb['X'] and
+                tb['Y'] < bb['Y'] + bb['Height'] and
+                tb['Y'] + tb['Height'] > bb['Y']):
+                
+                if is_contained(tb, bb):
+                    found_container = True
+                    break
+                else:
+                    # Overlaps but not contained -> potential overflow
+                    potential_overflow = f"Text '{t['Text']}' overflows Button '{b.get('Text', 'Unknown')}'"
+                    found_container = True # Mark as found so we don't treat as floating
+                    break
 
         if not found_container:
             # Check panels
+            # We want the SMALLEST panel that contains it or overlaps it most
+            candidate_panels = []
             for p in panels:
-                if is_contained(t['Bounds'], p['Bounds']):
-                    found_container = True
-                    break
-                if (t['Bounds']['X'] < p['Bounds']['X'] + p['Bounds']['Width'] and
-                    t['Bounds']['X'] + t['Bounds']['Width'] > p['Bounds']['X'] and
-                    t['Bounds']['Y'] < p['Bounds']['Y'] + p['Bounds']['Height'] and
-                    t['Bounds']['Y'] + t['Bounds']['Height'] > p['Bounds']['Y']):
-                    if t['Bounds']['Width'] > p['Bounds']['Width'] or t['Bounds']['Height'] > p['Bounds']['Height']:
-                        collisions.append(f"Text '{t['Text']}' overflows Panel")
-                    found_container = True
-                    break
+                pb = p['Bounds']
+                if (tb['X'] < pb['X'] + pb['Width'] and
+                    tb['X'] + tb['Width'] > pb['X'] and
+                    tb['Y'] < pb['Y'] + pb['Height'] and
+                    tb['Y'] + tb['Height'] > pb['Y']):
+                    candidate_panels.append(p)
+            
+            if candidate_panels:
+                # Sort by area ascending to find the most specific container
+                candidate_panels.sort(key=lambda x: x['Bounds']['Width'] * x['Bounds']['Height'])
+                p = candidate_panels[0]
+                if not is_contained(tb, p['Bounds']):
+                    potential_overflow = f"Text '{t['Text']}' overflows Panel"
+                found_container = True
+
+        if potential_overflow:
+            collisions.append(potential_overflow)
 
         # If still no container found, it might be floating text
         # Check if it overlaps with any button it shouldn't be in
-        if not found_container:
+        elif not found_container:
             for b in buttons:
-                if (t['Bounds']['X'] < b['Bounds']['X'] + b['Bounds']['Width'] and
-                    t['Bounds']['X'] + t['Bounds']['Width'] > b['Bounds']['X'] and
-                    t['Bounds']['Y'] < b['Bounds']['Y'] + b['Bounds']['Height'] and
-                    t['Bounds']['Y'] + t['Bounds']['Height'] > b['Bounds']['Y']):
+                bb = b['Bounds']
+                if (tb['X'] < bb['X'] + bb['Width'] and
+                    tb['X'] + tb['Width'] > bb['X'] and
+                    tb['Y'] < bb['Y'] + bb['Height'] and
+                    tb['Y'] + tb['Height'] > bb['Y']):
                     collisions.append(f"Floating Text '{t['Text']}' overlaps with Button '{b.get('Text', 'Unknown')}'")
 
     # 2. Check for Button-Button collisions (unrelated to text)

scripts/update_screenshots.py

@@ -40,6 +40,10 @@
         "discovery:fire_unlocked",
         "discovery:earth_unlocked",
         "tab:Spire",
+        "hover:Fire",
+        "click",
+        "hover:Earth",
+        "click",
         "screenshot:mixing_table"
     ]
 }

src/IncriElemental.Desktop/UI/LogSystem.cs

@@ -24,6 +24,9 @@ public void AddToLog(string message)
 
     public void Draw(SpriteBatch spriteBatch, SpriteFont? font, Texture2D pixel, VisualManager visuals)
     {
+        // Register the log background area as a panel for overflow auditing
+        visuals.DrawPanel(spriteBatch, pixel, new Rectangle(5, 50, 200, UiLayout.Height - 60), Color.Transparent, 0f);
+
         if (font != null)
         {
             visuals.DrawString(spriteBatch, font, "LOG", new Vector2(20, 55), Color.Gray * 0.5f);

src/IncriElemental.Desktop/UI/MixingTableSystem.cs

@@ -48,7 +48,7 @@ public void Draw(SpriteBatch spriteBatch, GameEngine engine, SpriteFont font, Te
             drawRect.X += (int)shake;
         }
 
-        spriteBatch.Draw(pixel, drawRect, Color.DarkSlateGray * 0.5f);
+        visuals.DrawPanel(spriteBatch, pixel, drawRect, Color.DarkSlateGray * 0.5f, 0.5f);
 
         var borderColor = Color.Gold;
         if (_successPulse > 0) borderColor = Color.White * _successPulse;
@@ -57,25 +57,26 @@ public void Draw(SpriteBatch spriteBatch, GameEngine engine, SpriteFont font, Te
         spriteBatch.Draw(pixel, new Rectangle(drawRect.X, drawRect.Bottom - 2, drawRect.Width, 2), borderColor);
 
         var title = "ALCHEMICAL VESSEL";
-        spriteBatch.DrawString(font, title, new Vector2(drawRect.Center.X - font.MeasureString(title).X / 2, drawRect.Y - 30), Color.Gold);
+        visuals.DrawString(spriteBatch, font, title, new Vector2(drawRect.Center.X - font.MeasureString(title).X / 2, drawRect.Y - 30), Color.Gold);
 
-        var y = drawRect.Y + 20;
+        var y = (float)drawRect.Y + 20;
         if (!_currentIngredients.Any())
         {
             var msg = "(Empty - Add elements below)";
-            spriteBatch.DrawString(font, msg, new Vector2(drawRect.Center.X - font.MeasureString(msg).X * 0.4f / 2, y), Color.Gray, 0f, Vector2.Zero, 0.8f, SpriteEffects.None, 0f);
+            visuals.DrawString(spriteBatch, font, msg, new Vector2(drawRect.Center.X - font.MeasureString(msg).X * 0.8f / 2, y), Color.Gray, 0.8f);
         }
         else
         {
             foreach (var kvp in _currentIngredients)
             {
                 var line = $"{kvp.Key}: {kvp.Value}";
-                spriteBatch.DrawString(font, line, new Vector2(drawRect.X + 20, y), visuals.GetColor(kvp.Key), 0f, Vector2.Zero, 0.8f, SpriteEffects.None, 0f);
+                var lineSize = font.MeasureString(line) * 0.8f;
+                visuals.DrawString(spriteBatch, font, line, new Vector2(drawRect.Center.X - lineSize.X / 2, y), visuals.GetColor(kvp.Key), 0.8f);
                 y += 25;
             }
 
             var prompt = "CLICK VESSEL TO MIX";
-            spriteBatch.DrawString(font, prompt, new Vector2(drawRect.Center.X - font.MeasureString(prompt).X * 0.8f / 2, drawRect.Bottom - 30), Color.White * 0.8f, 0f, Vector2.Zero, 0.8f, SpriteEffects.None, 0f);
+            visuals.DrawString(spriteBatch, font, prompt, new Vector2(drawRect.Center.X - font.MeasureString(prompt).X * 0.8f / 2, drawRect.Bottom - 30), Color.White * 0.8f, 0.8f);
         }
 
         // Ingredient Buttons
@@ -91,7 +92,7 @@ public void Draw(SpriteBatch spriteBatch, GameEngine engine, SpriteFont font, Te
             var rect = new Rectangle(curX, btnY, 60, 30);
             var hover = rect.Contains(mousePos);
             spriteBatch.Draw(pixel, rect, visuals.GetColor(type) * (hover ? 0.6f : 0.3f));
-            spriteBatch.DrawString(font, type.ToString()[..1], new Vector2(rect.Center.X - 5, rect.Center.Y - 10), Color.White);
+            visuals.DrawString(spriteBatch, font, type.ToString()[..1], new Vector2(rect.Center.X - 5, rect.Center.Y - 10), Color.White);
 
             curX += 70;
         }