Update app_enhanced.py

app_enhanced.py

@@ -539,83 +539,77 @@ class EnhancedComicGenerator:
         .panel img.pannable { cursor: grab; }
         .panel img.panning { cursor: grabbing; }
         .speech-bubble { position: absolute; display: flex; justify-content: center; align-items: center; width: 150px; height: 80px; min-width: 50px; min-height: 30px; box-sizing: border-box; z-index: 10; cursor: move; overflow: visible; font-size: 13px; font-weight: bold; text-align: center; font-family: 'Comic Neue', cursive; }
-        .bubble-text { padding: 0.8em; word-wrap: break-word; width: 100%; height: 100%; box-sizing: border-box; }
+        .bubble-text { padding: 0.8em; word-wrap: break-word; }
         .speech-bubble.selected { outline: 2px dashed #4CAF50; }
         .speech-bubble textarea { position: absolute; top: 0; left: 0; width: 100%; height: 100%; box-sizing: border-box; border: 1px solid #4CAF50; background: rgba(255,255,255,0.95); font: inherit; text-align: center; resize: none; padding: 8px; z-index: 102; }
         
-        /* <<< MODIFICATION START: New Advanced CSS for Speech Bubble >>> */
+        /* <<< MODIFICATION START: New Artistic Speech Bubble CSS >>> */
         .speech-bubble.speech {
-            --r: 1em; /* radius */
-            --b: var(--tail-size, 2.5em); /* tail base size */
-            --c1: var(--bubble-border-color, #4A4A4A);
-            --c2: var(--bubble-fill-color, white);
+            background: var(--bubble-fill-color, white);
+            color: var(--bubble-text-color, #333);
+            border-radius: 25px; /* Softer radius */
             padding: 0;
             border: none;
-            color: var(--bubble-text-color, #333);
-            background: none;
-            
-            /* Dynamic clip-path for tail cutout */
-            clip-path: polygon(
-                var(--r) 0, calc(100% - var(--r)) 0, 100% var(--r), 100% calc(100% - var(--r)),
-                calc(100% - var(--r)) 100%,
-                calc(clamp(var(--r), var(--tail-pos, 50%), calc(100% - var(--r))) + var(--b)/2) 100%,
-                clamp(var(--r), var(--tail-pos, 50%), calc(100% - var(--r))) calc(100% + var(--b)/2),
-                calc(clamp(var(--r), var(--tail-pos, 50%), calc(100% - var(--r))) - var(--b)/2) 100%,
-                var(--r) 100%, 0 calc(100% - var(--r)), 0 var(--r)
-            );
-            
-            border-image: conic-gradient(var(--c1) 0 0) fill 1/2px; /* Inner border */
+            box-shadow: 0 2px 5px rgba(0,0,0,0.2);
         }
-        .speech-bubble.speech::before {
+
+        .speech-bubble.speech::after {
             content: '';
             position: absolute;
-            inset: 0;
-            border-radius: var(--r);
-            background: var(--c2); /* Main fill color */
-            z-index: -1;
+            width: 0;
+            height: 0;
         }
 
-        /* --- 4-WAY ROTATION --- */
-        .speech-bubble.speech.tail-top { transform: rotate(180deg); }
-        .speech-bubble.speech.tail-left { transform: rotate(90deg); }
-        .speech-bubble.speech.tail-right { transform: rotate(-90deg); }
-        /* The text needs to be counter-rotated to stay upright */
-        .speech-bubble.speech.tail-top .bubble-text,
-        .speech-bubble.speech.tail-left .bubble-text,
-        .speech-bubble.speech.tail-right .bubble-text {
-            transform: rotate(var(--un-rotate, 0deg));
+        /* 4-WAY TAIL ROTATION CLASSES */
+        .speech-bubble.speech.tail-bottom::after {
+            border-left: 24px solid transparent;
+            border-right: 12px solid transparent;
+            border-top: 12px solid var(--bubble-fill-color, white);
+            border-bottom: 20px solid transparent;
+            left: 32px; 
+            bottom: -24px;
         }
-
-        /* --- Other Bubble Types --- */
-        .speech-bubble.thought {
-            background: var(--bubble-fill-color, white);
-            color: var(--bubble-text-color, #333);
-            border: 2px dashed var(--bubble-border-color, #555);
-            border-radius: 50%;
-            padding: 0;
+        .speech-bubble.speech.tail-top::after {
+            border-left: 12px solid transparent;
+            border-right: 24px solid transparent;
+            border-bottom: 12px solid var(--bubble-fill-color, white);
+            border-top: 20px solid transparent;
+            right: 32px; 
+            top: -24px;
         }
-        .thought-dot {
-            position: absolute;
-            background-color: var(--bubble-fill-color, white);
-            border: 2px dashed var(--bubble-border-color, #555);
-            border-radius: 50%;
-            z-index: -1;
+        .speech-bubble.speech.tail-right::after {
+            border-top: 24px solid transparent;
+            border-bottom: 12px solid transparent;
+            border-left: 12px solid var(--bubble-fill-color, white);
+            border-right: 20px solid transparent;
+            top: 18px; 
+            right: -24px;
+        }
+        .speech-bubble.speech.tail-left::after {
+            border-top: 12px solid transparent;
+            border-bottom: 24px solid transparent;
+            border-right: 12px solid var(--bubble-fill-color, white);
+            border-left: 20px solid transparent;
+            top: 28px;
+            left: -24px;
         }
-        /* Tail controls for Thought Bubble */
-        .speech-bubble.thought.tail-bottom .thought-dot-1 { bottom: -30%; left: var(--tail-pos, 50%); width: var(--tail-size, 20px); height: var(--tail-size, 20px); transform: translateX(-50%); }
-        .speech-bubble.thought.tail-bottom .thought-dot-2 { bottom: -50%; left: calc(var(--tail-pos, 50%) - 15%); width: calc(var(--tail-size, 20px) * 0.6); height: calc(var(--tail-size, 20px) * 0.6); transform: translateX(-50%); }
-        .speech-bubble.thought.tail-top .thought-dot-1 { top: -30%; left: var(--tail-pos, 50%); width: var(--tail-size, 20px); height: var(--tail-size, 20px); transform: translateX(-50%); }
-        .speech-bubble.thought.tail-top .thought-dot-2 { top: -50%; left: calc(var(--tail-pos, 50%) - 15%); width: calc(var(--tail-size, 20px) * 0.6); height: calc(var(--tail-size, 20px) * 0.6); transform: translateX(-50%); }
-        .speech-bubble.thought.tail-right .thought-dot-1 { right: -30%; top: var(--tail-pos, 50%); width: var(--tail-size, 20px); height: var(--tail-size, 20px); transform: translateY(-50%); }
-        .speech-bubble.thought.tail-right .thought-dot-2 { right: -50%; top: calc(var(--tail-pos, 50%) - 15%); width: calc(var(--tail-size, 20px) * 0.6); height: calc(var(--tail-size, 20px) * 0.6); transform: translateY(-50%); }
-        .speech-bubble.thought.tail-left .thought-dot-1 { left: -30%; top: var(--tail-pos, 50%); width: var(--tail-size, 20px); height: var(--tail-size, 20px); transform: translateY(-50%); }
-        .speech-bubble.thought.tail-left .thought-dot-2 { left: -50%; top: calc(var(--tail-pos, 50%) - 15%); width: calc(var(--tail-size, 20px) * 0.6); height: calc(var(--tail-size, 20px) * 0.6); transform: translateY(-50%); }
         /* <<< MODIFICATION END >>> */
 
+        .speech-bubble.thought { background: white; border: 2px dashed #555; color: #333; border-radius: 50%; }
         .speech-bubble.reaction { background: #FFD700; border: 3px solid #E53935; color: #D32F2F; font-weight: 900; text-transform: uppercase; width: 180px; clip-path: polygon(0% 25%, 17% 21%, 17% 0%, 31% 16%, 50% 4%, 69% 16%, 83% 0%, 83% 21%, 100% 25%, 85% 45%, 95% 62%, 82% 79%, 100% 97%, 79% 89%, 60% 98%, 46% 82%, 27% 95%, 15% 78%, 5% 62%, 15% 45%); }
         .speech-bubble.narration { background: #FAFAFA; border: 2px solid #BDBDBD; color: #424242; border-radius: 3px; }
         .speech-bubble.idea { background: linear-gradient(180deg,#FFFDD0 0%, #FFF8B5 100%); border: 2px solid #FFA500; color: #6a4b00; border-radius: 40% 60% 40% 60% / 60% 40% 60% 40%; }
         
+        /* Rotation logic for Thought Bubble dots */
+        .speech-bubble.thought::after { display: none; }
+        .thought-dot { position: absolute; background-color: white; border: 2px solid #555; border-radius: 50%; z-index: -1; }
+        .thought-dot-1 { width: 20px; height: 20px; bottom: -20px; left: 15px; }
+        .thought-dot-2 { width: 12px; height: 12px; bottom: -32px; left: 5px; }
+        .speech-bubble.flipped .thought-dot-1 { left: auto; right: 15px; }
+        .speech-bubble.flipped .thought-dot-2 { left: auto; right: 5px; }
+        .speech-bubble.flipped-vertical .thought-dot-1 { bottom: auto; top: -20px; }
+        .speech-bubble.flipped-vertical .thought-dot-2 { bottom: auto; top: -32px; }
+
         .resize-handle { position: absolute; width: 10px; height: 10px; background: #2196F3; border: 1px solid white; border-radius: 50%; display: none; z-index: 11; }
         .speech-bubble.selected .resize-handle { display: block; }
         .resize-handle.se { bottom: -5px; right: -5px; cursor: se-resize; }
@@ -637,8 +631,6 @@ class EnhancedComicGenerator:
         .color-picker-grid div { text-align: center; }
         .color-picker-grid label { font-size: 11px; }
         .color-picker-grid input[type="color"] { height: 25px; padding: 2px; }
-        .slider-group { margin-top: 5px; }
-        .slider-group label { font-size: 11px; margin-right: 5px; }
     </style>
 </head>
 <body>
@@ -673,17 +665,10 @@ class EnhancedComicGenerator:
             <button onclick="addBubbleToPanel()" class="action-button">💬 Add Bubble</button>
             <button onclick="deleteBubble()" class="reset-button">🗑️ Delete Bubble</button>
         </div>
+        <!-- <<< MODIFICATION: Tail controls are now simpler, just one button >>> -->
         <div class="control-group" id="tail-controls" style="display: none;">
             <label>Tail Controls</label>
-             <div class="slider-group">
-                <label for="tail-pos-slider">Position</label>
-                <input type="range" id="tail-pos-slider" min="10" max="90" value="50" step="1">
-            </div>
-            <div class="slider-group">
-                <label for="tail-size-slider">Size</label>
-                <input type="range" id="tail-size-slider" min="10" max="40" value="25" step="1">
-            </div>
-            <button onclick="flipBubbleTail()" class="secondary-button">🔄 Flip Edge</button>
+            <button onclick="rotateBubbleTail()" class="secondary-button">🔄 Rotate Tail</button>
         </div>
         <div class="control-group">
             <label>Panel Tools (Select Panel):</label>
@@ -776,18 +761,6 @@ class EnhancedComicGenerator:
                     currentlySelectedBubble.style.setProperty('--bubble-fill-color', e.target.value);
                 }
             });
-            
-            document.getElementById('tail-pos-slider').addEventListener('input', (e) => {
-                if (currentlySelectedBubble) {
-                    currentlySelectedBubble.style.setProperty('--tail-pos', e.target.value + '%');
-                }
-            });
-            document.getElementById('tail-size-slider').addEventListener('input', (e) => {
-                if (currentlySelectedBubble) {
-                    // For speech bubble, it's the base width 'b'. For thought, it's the dot size.
-                    currentlySelectedBubble.style.setProperty('--tail-size', e.target.value + 'px');
-                }
-            });
 
             document.addEventListener('mousemove', e => { if (isPanning) panImage(e); if (draggedBubble) drag(e); if(isResizing) resizeBubble(e); });
             document.addEventListener('mouseup', e => { if (isPanning) stopPan(e); if (draggedBubble) stopDrag(e); if(isResizing) stopResize(e);});
@@ -831,7 +804,7 @@ class EnhancedComicGenerator:
         }
 
         function applyBubbleType(bubble, type) {
-            bubble.innerHTML = bubble.querySelector('.bubble-text').outerHTML; // Clear old pseudo-elements
+            bubble.querySelectorAll('.thought-dot').forEach(el => el.remove());
             let classesToKeep = 'speech-bubble';
             if (bubble.classList.contains('selected')) classesToKeep += ' selected';
             
@@ -841,19 +814,14 @@ class EnhancedComicGenerator:
 
             if (type === 'speech') {
                 bubble.classList.add('tail-bottom');
-                bubble.dataset.tailEdge = 'bottom';
-                bubble.style.setProperty('--un-rotate', '0deg'); // Reset rotation
+                bubble.dataset.tailPos = '0';
             }
             if (type === 'thought') {
-                bubble.classList.add('tail-bottom');
-                bubble.dataset.tailEdge = 'bottom';
-                // Add the dots for the thought bubble tail
-                const dot1 = document.createElement('div');
-                dot1.className = 'thought-dot thought-dot-1';
-                const dot2 = document.createElement('div');
-                dot2.className = 'thought-dot thought-dot-2';
-                bubble.appendChild(dot1);
-                bubble.appendChild(dot2);
+                for (let i = 1; i <= 2; i++) {
+                    const dot = document.createElement('div');
+                    dot.className = `thought-dot thought-dot-${i}`;
+                    bubble.appendChild(dot);
+                }
             }
         }
         
@@ -868,28 +836,28 @@ class EnhancedComicGenerator:
             currentlySelectedBubble.style.fontFamily = font;
         }
         
-        function flipBubbleTail() {
+        // <<< MODIFICATION: rotateBubbleTail now handles both Speech and Thought bubbles >>>
+        function rotateBubbleTail() {
             if (!currentlySelectedBubble) return;
-            const type = currentlySelectedBubble.dataset.type;
-            if (type !== 'speech' && type !== 'thought') return;
 
-            const edges = ['bottom', 'right', 'top', 'left'];
-            const currentEdge = currentlySelectedBubble.dataset.tailEdge || 'bottom';
-            let currentEdgeIndex = edges.indexOf(currentEdge);
-            
-            currentlySelectedBubble.classList.remove('tail-' + edges[currentEdgeIndex]);
-            let nextEdgeIndex = (currentEdgeIndex + 1) % edges.length;
-            
-            currentlySelectedBubble.classList.add('tail-' + edges[nextEdgeIndex]);
-            currentlySelectedBubble.dataset.tailEdge = edges[nextEdgeIndex];
-
-            // Handle counter-rotation for speech bubble text
-            if (type === 'speech') {
-                let rotation = '0deg';
-                if (edges[nextEdgeIndex] === 'top') rotation = '180deg';
-                if (edges[nextEdgeIndex] === 'left') rotation = '-90deg';
-                if (edges[nextEdgeIndex] === 'right') rotation = '90deg';
-                currentlySelectedBubble.style.setProperty('--un-rotate', rotation);
+            const bubbleType = currentlySelectedBubble.dataset.type;
+
+            if (bubbleType === 'speech') {
+                const positions = ['tail-bottom', 'tail-right', 'tail-top', 'tail-left'];
+                let currentPos = parseInt(currentlySelectedBubble.dataset.tailPos || 0);
+                currentlySelectedBubble.classList.remove(positions[currentPos]);
+                let nextPos = (currentPos + 1) % positions.length;
+                currentlySelectedBubble.classList.add(positions[nextPos]);
+                currentlySelectedBubble.dataset.tailPos = nextPos;
+            } else if (bubbleType === 'thought') {
+                const isFlippedH = currentlySelectedBubble.classList.contains('flipped');
+                const isFlippedV = currentlySelectedBubble.classList.contains('flipped-vertical');
+                if (!isFlippedH && !isFlippedV) { currentlySelectedBubble.classList.add('flipped'); }
+                else if (isFlippedH && !isFlippedV) { currentlySelectedBubble.classList.add('flipped-vertical'); }
+                else if (isFlippedH && isFlippedV) { currentlySelectedBubble.classList.remove('flipped'); }
+                else { currentlySelectedBubble.classList.remove('flipped-vertical'); }
+            } else {
+                 alert("Tail rotation is only available for Speech and Thought bubbles.");
             }
         }
         
@@ -927,13 +895,10 @@ class EnhancedComicGenerator:
                 document.getElementById('zoom-slider').disabled = true;
                 bubbleControls.forEach(id => document.getElementById(id).disabled = false);
 
-                const type = currentlySelectedBubble.dataset.type;
-                if (type === 'speech' || type === 'thought') {
+                // <<< MODIFICATION: Show tail controls for both Speech and Thought bubbles >>>
+                const bubbleType = currentlySelectedBubble.dataset.type;
+                if (bubbleType === 'speech' || bubbleType === 'thought') {
                     tailControls.style.display = 'block';
-                    const currentSize = parseFloat(styles.getPropertyValue('--tail-size')) || (type === 'speech' ? 40 : 20) ; // 40px base, 20px dot
-                    document.getElementById('tail-size-slider').value = currentSize;
-                    const currentPos = parseInt(styles.getPropertyValue('--tail-pos')) || 50;
-                    document.getElementById('tail-pos-slider').value = currentPos;
                 } else {
                     tailControls.style.display = 'none';
                 }
@@ -976,25 +941,11 @@ class EnhancedComicGenerator:
             offset = { x: e.clientX - rect.left, y: e.clientY - rect.top };
         }
 
-        // <<< MODIFICATION: Drag function now constrains movement to fix edge bug >>>
         function drag(e) {
             if (!draggedBubble) return;
-            const parentPanel = draggedBubble.parentElement;
-            const parentRect = parentPanel.getBoundingClientRect();
-            
-            let x = e.clientX - parentRect.left - offset.x;
-            let y = e.clientY - parentRect.top - offset.y;
-
-            // Constrain X position
-            x = Math.max(0, x); // Min-x
-            x = Math.min(parentRect.width - draggedBubble.offsetWidth, x); // Max-x
-
-            // Constrain Y position
-            y = Math.max(0, y); // Min-y
-            y = Math.min(parentRect.height - draggedBubble.offsetHeight, y); // Max-y
-
-            draggedBubble.style.left = `${x}px`;
-            draggedBubble.style.top = `${y}px`;
+            const parentRect = draggedBubble.parentElement.getBoundingClientRect();
+            draggedBubble.style.left = `${e.clientX - parentRect.left - offset.x}px`;
+            draggedBubble.style.top = `${e.clientY - parentRect.top - offset.y}px`;
         }
 
         function stopDrag() { draggedBubble = null; }