ywana-core8 0.2.6 → 0.2.8

package/src/desktop/WindowManager.js

@@ -6,6 +6,7 @@ export class WindowManager {
         this.windows = new Map()
         this.activeWindowId = null
         this.nextZIndex = 1000
+        this.maxZIndex = 9999 // Maximum z-index for windows (ApplicationMenu is 10000)
         this.listeners = new Set()
         this.desktopSize = desktopSize
     }
@@ -77,7 +78,7 @@ export class WindowManager {
             size: size,
             minimized: false,
             maximized: false,
-            zIndex: this.nextZIndex++,
+            zIndex: Math.min(this.nextZIndex++, this.maxZIndex),
             ...config
         }
 
@@ -101,9 +102,9 @@ export class WindowManager {
         let x = baseX + (existingWindows.length * offsetStep)
         let y = baseY + (existingWindows.length * offsetStep)
 
-        // Check if it goes out of desktop bounds
+        // Check if it goes out of workspace bounds
         const maxX = this.desktopSize.width - windowSize.width - 20
-        const maxY = this.desktopSize.height - windowSize.height - 100 // Space for taskbar
+        const maxY = this.desktopSize.height - windowSize.height - 20 // Workspace boundaries
 
         // If out of bounds, restart cascade
         if (x > maxX || y > maxY) {
@@ -152,8 +153,11 @@ export class WindowManager {
             window.minimized = false
         }
 
-        // Bring to front
-        window.zIndex = this.nextZIndex++
+        // Bring to front (but never above ApplicationMenu)
+        if (this.nextZIndex >= this.maxZIndex) {
+            this.resetZIndexes()
+        }
+        window.zIndex = Math.min(this.nextZIndex++, this.maxZIndex)
         this.activeWindowId = windowId
 
         this.notifyListeners()
@@ -221,7 +225,7 @@ export class WindowManager {
         const minWidth = 200
         const minHeight = 150
         const maxWidth = this.desktopSize.width
-        const maxHeight = this.desktopSize.height - 50 // Space for taskbar
+        const maxHeight = this.desktopSize.height // Workspace boundaries
 
         const constrainedSize = {
             width: Math.max(minWidth, Math.min(size.width || window.size.width, maxWidth)),
@@ -264,7 +268,7 @@ export class WindowManager {
             if (window.maximized) return // Maximized windows don't need repositioning
 
             const maxX = this.desktopSize.width - window.size.width
-            const maxY = this.desktopSize.height - window.size.height - 50 // Space for taskbar
+            const maxY = this.desktopSize.height - window.size.height // Workspace boundaries
 
             // Adjust position if out of bounds
             if (window.position.x > maxX) {
@@ -306,7 +310,7 @@ export class WindowManager {
         const cols = Math.ceil(Math.sqrt(visibleWindows.length))
         const rows = Math.ceil(visibleWindows.length / cols)
         const windowWidth = Math.floor(this.desktopSize.width / cols)
-        const windowHeight = Math.floor((this.desktopSize.height - 80) / rows) // Space for taskbar
+        const windowHeight = Math.floor(this.desktopSize.height / rows) // Workspace boundaries
 
         visibleWindows.forEach((window, index) => {
             const col = index % cols
@@ -335,7 +339,7 @@ export class WindowManager {
 
         window.position = {
             x: (this.desktopSize.width - window.size.width) / 2,
-            y: (this.desktopSize.height - window.size.height - 50) / 2 // Space for taskbar
+            y: (this.desktopSize.height - window.size.height) / 2 // Workspace center
         }
 
         this.notifyListeners()
@@ -351,7 +355,7 @@ export class WindowManager {
 
         visibleWindows.forEach((window, index) => {
             const baseX = (this.desktopSize.width - window.size.width) / 2
-            const baseY = (this.desktopSize.height - window.size.height - 50) / 2
+            const baseY = (this.desktopSize.height - window.size.height) / 2
 
             window.position = {
                 x: baseX + (index * offsetStep),
@@ -375,4 +379,22 @@ export class WindowManager {
             desktopSize: this.desktopSize
         }
     }
+
+    /**
+     * Reset z-indexes when they reach the maximum
+     */
+    resetZIndexes() {
+        const windows = Array.from(this.windows.values())
+        // Sort windows by current z-index
+        windows.sort((a, b) => a.zIndex - b.zIndex)
+
+        // Reassign z-indexes starting from 1000
+        this.nextZIndex = 1000
+        windows.forEach((window, index) => {
+            window.zIndex = this.nextZIndex + index
+        })
+        this.nextZIndex = 1000 + windows.length
+
+        this.notifyListeners()
+    }
 }

package/src/desktop/desktop-linux.css

@@ -114,6 +114,61 @@
     border-color: rgba(53, 132, 228, 0.5);
 }
 
+/* Linux Start Button Styling (GNOME Activities) */
+.desktop--linux .toggle-button {
+    /* Reset selector styles and apply Linux button styling */
+    position: relative;
+    padding: 8px 16px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    overflow: hidden;
+    border: 1px solid rgba(255, 255, 255, 0.15);
+    outline: none;
+    transition: all 0.3s ease;
+    color: #ffffff;
+    background: linear-gradient(180deg, rgba(53, 132, 228, 0.9) 0%, rgba(26, 95, 180, 0.9) 100%);
+    min-height: 40px;
+    border-radius: 8px;
+    cursor: pointer;
+    font-family: 'Ubuntu', 'Cantarell', sans-serif;
+    font-weight: 500;
+    text-decoration: none;
+    white-space: nowrap;
+    list-style: none;
+    margin: 0;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+}
+
+.desktop--linux .toggle-button:hover:not(.toggle-button--disabled) {
+    background: linear-gradient(180deg, rgba(53, 132, 228, 1) 0%, rgba(26, 95, 180, 1) 100%);
+    border-color: rgba(255, 255, 255, 0.25);
+    transform: translateY(-1px);
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.25);
+}
+
+.desktop--linux .toggle-button.selected {
+    background: linear-gradient(180deg, rgba(26, 95, 180, 0.9) 0%, rgba(15, 70, 140, 0.9) 100%);
+    color: #ffffff;
+    border-color: rgba(255, 255, 255, 0.3);
+    box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.3), 0 2px 4px rgba(53, 132, 228, 0.4);
+}
+
+.desktop--linux .toggle-button:focus {
+    outline: 2px solid rgba(53, 132, 228, 0.6);
+    outline-offset: 2px;
+}
+
+.desktop--linux .toggle-button--disabled {
+    background: rgba(255, 255, 255, 0.1) !important;
+    color: rgba(255, 255, 255, 0.4) !important;
+    border-color: rgba(255, 255, 255, 0.05) !important;
+    cursor: not-allowed;
+    opacity: 1;
+    box-shadow: none;
+}
+
 /* Linux Application Menu (Activities Overview) */
 .desktop--linux .application-menu {
     background: rgba(36, 31, 49, 0.95);

package/src/desktop/desktop-macos.css

@@ -137,6 +137,63 @@
     color: #007aff;
 }
 
+/* macOS Start Button Styling (Dock-inspired) */
+.desktop--macos .toggle-button {
+    /* Reset selector styles and apply macOS button styling */
+    position: relative;
+    padding: 8px 16px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    overflow: hidden;
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    outline: none;
+    transition: all 0.3s cubic-bezier(0.25, 0.46, 0.45, 0.94);
+    color: #1d1d1f;
+    background: linear-gradient(180deg, rgba(255, 255, 255, 0.9) 0%, rgba(248, 248, 248, 0.9) 100%);
+    min-height: 40px;
+    border-radius: 12px;
+    cursor: pointer;
+    font-family: -apple-system, BlinkMacSystemFont, 'SF Pro Display', sans-serif;
+    font-weight: 500;
+    text-decoration: none;
+    white-space: nowrap;
+    list-style: none;
+    margin: 0;
+    backdrop-filter: blur(20px);
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.desktop--macos .toggle-button:hover:not(.toggle-button--disabled) {
+    background: linear-gradient(180deg, rgba(255, 255, 255, 0.95) 0%, rgba(245, 245, 245, 0.95) 100%);
+    border-color: rgba(0, 0, 0, 0.15);
+    transform: translateY(-1px);
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+}
+
+.desktop--macos .toggle-button.selected {
+    background: linear-gradient(180deg, rgba(0, 122, 255, 0.9) 0%, rgba(0, 100, 210, 0.9) 100%);
+    color: white;
+    border-color: rgba(0, 122, 255, 0.3);
+    box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.2), 0 2px 8px rgba(0, 122, 255, 0.3);
+}
+
+.desktop--macos .toggle-button:focus {
+    outline: 2px solid rgba(0, 122, 255, 0.5);
+    outline-offset: 2px;
+}
+
+.desktop--macos .toggle-button--disabled {
+    background: rgba(248, 248, 248, 0.5) !important;
+    color: rgba(60, 60, 67, 0.3) !important;
+    border-color: rgba(0, 0, 0, 0.05) !important;
+    cursor: not-allowed;
+    opacity: 1;
+    box-shadow: none;
+    backdrop-filter: none;
+}
+
 /* macOS Application Menu (Launchpad-inspired) */
 .desktop--macos .application-menu {
     background: rgba(255, 255, 255, 0.9);

package/src/desktop/desktop-windows.css

@@ -104,6 +104,60 @@
     border-color: rgba(255, 255, 255, 0.4);
 }
 
+/* Windows Start Button Styling */
+.desktop--windows .toggle-button {
+    /* Reset selector styles and apply Windows button styling */
+    position: relative;
+    padding: 8px 16px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    overflow: hidden;
+    border: 1px solid rgba(255, 255, 255, 0.2);
+    outline: none;
+    transition: all 0.2s ease;
+    color: white;
+    background: linear-gradient(180deg, #0078d4 0%, #106ebe 100%);
+    min-height: 40px;
+    border-radius: 4px;
+    cursor: pointer;
+    font-family: 'Segoe UI', sans-serif;
+    font-weight: 500;
+    text-decoration: none;
+    white-space: nowrap;
+    list-style: none;
+    margin: 0;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+}
+
+.desktop--windows .toggle-button:hover:not(.toggle-button--disabled) {
+    background: linear-gradient(180deg, #106ebe 0%, #005a9e 100%);
+    border-color: rgba(255, 255, 255, 0.3);
+    transform: none;
+}
+
+.desktop--windows .toggle-button.selected {
+    background: linear-gradient(180deg, #005a9e 0%, #004578 100%);
+    color: white;
+    border-color: rgba(255, 255, 255, 0.4);
+    box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.3);
+}
+
+.desktop--windows .toggle-button:focus {
+    outline: 2px solid rgba(255, 255, 255, 0.5);
+    outline-offset: 2px;
+}
+
+.desktop--windows .toggle-button--disabled {
+    background: rgba(200, 200, 200, 0.3) !important;
+    color: rgba(100, 100, 100, 0.5) !important;
+    border-color: rgba(255, 255, 255, 0.1) !important;
+    cursor: not-allowed;
+    opacity: 1;
+    box-shadow: none;
+}
+
 /* Windows Application Menu */
 .desktop--windows .application-menu {
     background: rgba(248, 248, 248, 0.95);

package/src/desktop/desktop.css

@@ -24,8 +24,38 @@
     width: 100%;
     height: 100%;
     z-index: 1;
+    display: flex;
+    flex-direction: column;
 }
 
+/* Workspace container - takes available space above taskbar */
+.desktop__workspace-container {
+    position: relative;
+    flex: 1;
+    overflow: hidden;
+    z-index: 1;
+}
+
+/* Workspace - container for windows with boundaries */
+.workspace {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+}
+
+.desktop-taskbar {
+    
+    & .icon {
+        color: white;
+        & :hover {
+            color: #fff;
+            background-color: rgba(255, 255, 255, 0.1);
+        }
+    }
+}
+
+
 /* Desktop variants */
 .desktop--dark {
     color: white;

package/src/desktop/desktop.js

@@ -3,6 +3,8 @@ import { WindowProvider, useWindows } from './WindowContext'
 import { Window } from './window'
 import { ApplicationMenu } from './ApplicationMenu'
 import { defaultAppManager } from './AppManager'
+import { ToggleButton } from '../html/selector'
+import { Icon } from '../html/icon'
 import './desktop.css'
 import './desktop-windows.css'
 import './desktop-linux.css'
@@ -57,17 +59,17 @@ export const AppProvider = ({ children, appManager = defaultAppManager }) => {
 /**
  * Desktop layout component - manages overall desktop structure and sizing
  */
-const DesktopLayout = ({ children, className = '', theme = 'windows', ...props }) => {
+const DesktopLayout = ({ children, className = '', theme = 'windows', workspaceRef, ...props }) => {
     const desktopRef = useRef(null)
     const { windowManager } = useWindows()
 
-    // Measure desktop size on mount and resize
+    // Measure workspace size on mount and resize
     useEffect(() => {
-        let currentSize = { width: 1200, height: 800 }
+        let currentSize = { width: 1200, height: 750 } // Default workspace size (desktop - taskbar)
 
-        const measureDesktop = () => {
-            if (desktopRef.current) {
-                const rect = desktopRef.current.getBoundingClientRect()
+        const measureWorkspace = () => {
+            if (workspaceRef.current) {
+                const rect = workspaceRef.current.getBoundingClientRect()
                 const newSize = {
                     width: rect.width,
                     height: rect.height
@@ -82,12 +84,12 @@ const DesktopLayout = ({ children, className = '', theme = 'windows', ...props }
         }
 
         // Initial measurement
-        measureDesktop()
+        measureWorkspace()
 
         // Listen for resize
-        const resizeObserver = new ResizeObserver(measureDesktop)
-        if (desktopRef.current) {
-            resizeObserver.observe(desktopRef.current)
+        const resizeObserver = new ResizeObserver(measureWorkspace)
+        if (workspaceRef.current) {
+            resizeObserver.observe(workspaceRef.current)
         }
 
         return () => {
@@ -124,13 +126,13 @@ const DesktopLayout = ({ children, className = '', theme = 'windows', ...props }
 }
 
 /**
- * Workspace - renders windows only
+ * Workspace - container for windows with proper boundaries
  */
 export const Workspace = ({ children }) => {
     const { windows } = useWindows()
 
     return (
-        <>
+        <div className="workspace">
             {children}
 
             {/* Render windows using Window component */}
@@ -148,7 +150,7 @@ export const Workspace = ({ children }) => {
                     </div>
                 </Window>
             ))}
-        </>
+        </div>
     )
 }
 
@@ -156,6 +158,11 @@ export const Workspace = ({ children }) => {
  * DesktopTaskbar - handles window creation and management
  */
 export const DesktopTaskbar = () => {
+    console.log('DesktopTaskbar render')
+
+    const windowsContext = useWindows()
+    console.log('useWindows result:', windowsContext)
+
     const {
         createWindow,
         windows,
@@ -163,12 +170,20 @@ export const DesktopTaskbar = () => {
         activeWindowId,
         focusWindow,
         minimizeWindow,
-        closeWindow
-    } = useWindows()
+        closeWindow,
+        cascadeWindows,
+        tileWindows,
+        centerAllWindows,
+        clearAllWindows
+    } = windowsContext
 
-    const { open: openApplicationMenu } = useApplicationMenu()
+    const { isOpen, toggle } = useApplicationMenu()
+    console.log('DesktopTaskbar - isOpen:', isOpen, 'toggle:', toggle)
 
     const handleCreateWindow = () => {
+        console.log('handleCreateWindow called!')
+        console.log('createWindow function:', createWindow)
+
         const windowTypes = [
             { title: 'File Explorer', icon: '📁', size: { width: 600, height: 400 } },
             { title: 'Text Editor', icon: '📝', size: { width: 500, height: 350 } },
@@ -178,6 +193,7 @@ export const DesktopTaskbar = () => {
         ]
 
         const randomType = windowTypes[Math.floor(Math.random() * windowTypes.length)]
+        console.log('Creating window:', randomType)
 
         createWindow({
             title: randomType.title,
@@ -226,11 +242,7 @@ export const DesktopTaskbar = () => {
     }
 
     return (
-        <div style={{
-                position: 'absolute',
-                bottom: 0,
-                left: 0,
-                right: 0,
+        <div className='desktop-taskbar' style={{
                 height: '50px',
                 background: 'rgba(0,0,0,0.8)',
                 display: 'flex',
@@ -239,45 +251,16 @@ export const DesktopTaskbar = () => {
                 gap: '8px'
             }}>
                 {/* Start button */}
-                <button
-                    onClick={openApplicationMenu}
-                    style={{
-                        padding: '8px 16px',
-                        background: '#1976d2',
-                        color: 'white',
-                        border: 'none',
-                        borderRadius: '4px',
-                        cursor: 'pointer',
-                        fontSize: '14px',
-                        fontWeight: 'bold',
-                        flexShrink: 0,
-                        display: 'flex',
-                        alignItems: 'center',
-                        gap: '6px'
+                <ToggleButton
+                    checked={isOpen}
+                    onToggle={() => {
+                        console.log('Start button toggled, current state:', isOpen)
+                        toggle()
                     }}
-                    title="Open application menu"
+                    icon="start"
+                    label="Start"
                 >
-                    <span style={{ fontSize: '16px' }}>🚀</span>
-                    Start
-                </button>
-
-                {/* Create window button (for testing) */}
-                <button
-                    onClick={handleCreateWindow}
-                    style={{
-                        padding: '8px 12px',
-                        background: '#666',
-                        color: 'white',
-                        border: 'none',
-                        borderRadius: '4px',
-                        cursor: 'pointer',
-                        fontSize: '12px',
-                        flexShrink: 0
-                    }}
-                    title="Create random window (for testing)"
-                >
-                    +
-                </button>
+                </ToggleButton>
 
             {/* Separator */}
             <div style={{
@@ -356,6 +339,49 @@ export const DesktopTaskbar = () => {
                 ))}
             </div>
 
+            {/* Window Layout Controls */}
+            <div style={{
+                display: 'flex',
+                gap: '4px',
+                alignItems: 'center',
+                marginLeft: 'auto',
+                marginRight: '8px'
+            }}>
+
+                <Icon clickable size="small"
+                    action={() => {
+                        console.log('Cascade windows clicked!')
+                        cascadeWindows()
+                    }}
+                    icon="view_stream"
+                    label="Cascade"
+                />
+                <Icon clickable size="small"
+                    action={() => {
+                        console.log('Tile windows clicked!')
+                        tileWindows()
+                    }}
+                    icon="view_module"
+                    label="Tile"
+                />
+                <Icon clickable size="small"
+                    action={() => {
+                        console.log('Center all windows clicked!')
+                        centerAllWindows()
+                    }}
+                    icon="center_focus_strong"
+                    label="Center"
+                />
+                <Icon clickable size="small"
+                    action={() => {
+                        console.log('Clear all windows clicked!')
+                        clearAllWindows()
+                    }}
+                    icon="clear_all"
+                    label="Clear"
+                />
+            </div>
+
             {/* Debug info */}
             <div style={{
                 color: 'rgba(255,255,255,0.7)',
@@ -375,18 +401,26 @@ export const DesktopTaskbar = () => {
  */
 const DesktopInternal = ({ desktopSize, children, ...props }) => {
     const { isOpen, close } = useApplicationMenu()
+    const workspaceRef = useRef(null)
 
     return (
         <WindowProvider desktopSize={desktopSize}>
-            <DesktopLayout {...props}>
-                <Workspace>
-                    {children}
-                </Workspace>
+            <DesktopLayout workspaceRef={workspaceRef} {...props}>
+                {/* Workspace container - has its own boundaries */}
+                <div ref={workspaceRef} className="desktop__workspace-container">
+                    <Workspace>
+                        {children}
+                    </Workspace>
+
+                    {/* ApplicationMenu positioned over workspace */}
+                    <ApplicationMenu
+                        isOpen={isOpen}
+                        onClose={close}
+                    />
+                </div>
+
+                {/* Taskbar at bottom - separate from workspace */}
                 <DesktopTaskbar />
-                <ApplicationMenu
-                    isOpen={isOpen}
-                    onClose={close}
-                />
             </DesktopLayout>
         </WindowProvider>
     )