macOS: Window#focus, renamed WindowMacTitlebarStyle SMALL/LARGE -> UN…

…IFIED/UNIFIED_COMPACT, shortcut to test titlebar changes
i10416 · Jan 11, 2022 · eaa9b62 · eaa9b62
1 parent 9592c0d
commit eaa9b62
Show file tree

Hide file tree

Showing 12 changed files with 138 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -95,8 +95,8 @@ Alpha. Expect API breakages.
 |                   | Windows | macOS | X11 |
 |-------------------|---------|-------|-----|
 | isHighContrast    | ✅      | ✅    | ➖  |
-| isDark            | [#161](https://github.com/HumbleUI/JWM/issues/161) | ✅ | ➖ |
-| isInverted       | [#161](https://github.com/HumbleUI/JWM/issues/161) | ✅ | ➖ |
+| isDark            | ✅      | ✅ | ➖ |
+| isInverted        | [#161](https://github.com/HumbleUI/JWM/issues/161) | ✅ | ➖ |
 
 ### Window
 
@@ -121,7 +121,9 @@ Alpha. Expect API breakages.
 | setTitle            | ✅   | ✅   | ✅   |
 | setIcon             | ✅   | ✅   | [#95](https://github.com/HumbleUI/JWM/issues/95)  |
 | Set system cursor   | ✅   | ✅   | [#99](https://github.com/HumbleUI/JWM/issues/99)  |
-| Remove decorations  | [#75](https://github.com/HumbleUI/JWM/issues/75)  | [#75](https://github.com/HumbleUI/JWM/issues/75)  | [#75](https://github.com/HumbleUI/JWM/issues/75)  |
+| Customize titlebar  | [#75](https://github.com/HumbleUI/JWM/issues/75)  | [#75](https://github.com/HumbleUI/JWM/issues/75)  | [#75](https://github.com/HumbleUI/JWM/issues/75)  |
+| focus               | ❌   | ✅   | ❌   |
+| Get ZOrder          | ❌   | ✅   | ❌   |
 | Set custom cursor   | ❌   | ❌   | ❌   |
 | openFile            | ❌   | ❌   | ❌   |
 | openFolder          | ❌   | ❌   | ❌   |

diff --git a/examples/dashboard/java/Example.java b/examples/dashboard/java/Example.java
@@ -62,12 +62,10 @@ public Example() {
             case 3 -> window.setWindowPosition(bounds.getLeft(), bounds.getTop() + bounds.getHeight() / 2);
             case 4 -> window.setWindowPosition(bounds.getLeft() + bounds.getWidth() / 2, bounds.getTop() + bounds.getHeight() / 2);
         }
-        if (window instanceof WindowMac windowMac) {
-            window.setTitle("JWM Demo");
-            windowMac.setSubtitle("Window #" + count);
-        } else {
-            window.setTitle("JWM Window #" + count);
-        }
+
+        window.setTitle("JWM Window #" + count);
+        if (window instanceof WindowMac windowMac)
+            windowMac.setSubtitle("Window Subtitle");
 
         switch (Platform.CURRENT) {
             case WINDOWS -> {
@@ -78,13 +76,6 @@ public Example() {
             }
         }
 
-//         window.setTitlebarVisible(false);
-        if (window instanceof WindowMac windowMac) {
-            windowMac.setTitlebarStyle(WindowMacTitlebarStyle.UNIFIED_SMALL);
-            windowMac.setFullSizeContentView(true);
-//            windowMac.setTrafficLightPosition(5, 30);
-        }
-
         window.setVisible(true);
         initialized = true;
     }

diff --git a/examples/dashboard/java/Options.java b/examples/dashboard/java/Options.java
@@ -0,0 +1,29 @@
+package io.github.humbleui.jwm.examples;
+
+public class Options {
+    public final String[] _options;
+    public int _idx;
+
+    public Options(int idx, String... options) {
+        _options = options;
+        _idx = idx;
+    }
+
+    public Options(String... options) {
+        this(0, options);
+    }
+
+    public String get() {
+        return _options[_idx];
+    }
+
+    public String next() {
+        _idx = (_idx + 1) % _options.length;
+        return _options[_idx];
+    }
+
+    public String prev() {
+        _idx = (_idx + _options.length - 1) % _options.length;
+        return _options[_idx];
+    }
+}
diff --git a/examples/dashboard/java/PanelLegend.java b/examples/dashboard/java/PanelLegend.java
@@ -13,6 +13,7 @@ public PanelLegend(Window window) {
         shortcuts.put("L", "Toggle Layer");
         shortcuts.put("P", "Pause");
         shortcuts.put("N", "New Window");
+        shortcuts.put("T", "Toggle Titlebar");
         shortcuts.put("W", "Close Window");
         shortcuts.put("F", "Clipboard formats");
         shortcuts.put("Z", "Toggle Z-order");

diff --git a/examples/dashboard/java/PanelScreens.java b/examples/dashboard/java/PanelScreens.java
@@ -12,9 +12,12 @@ public class PanelScreens extends Panel {
     public Paint fill = new Paint().setColor(0x20FFFFFF);
     public Paint white = new Paint().setColor(0xFFFFFFFF);
     public int idx = 0;
+    public Options titleStyles = new Options("Default", "Hidden");
 
     public PanelScreens(Window window) {
         super(window);
+        if (Platform.MACOS == Platform.CURRENT)
+            titleStyles = new Options("Default", "Hidden", "Transparent", "Unified", "Unified Compact", "Unified Transparent", "Unified Compact Transparent");
     }
 
     @Override
@@ -54,6 +57,43 @@ public void accept(Event e) {
                             window.setContentSize(width, height);
                         }
                     }
+                    case T -> {
+                        String titleStyle = titleStyles.next();
+                        if (Platform.MACOS == Platform.CURRENT) {
+                            WindowMac w = (WindowMac) window;                        
+                            switch (titleStyle) {
+                                case "Default" -> {
+                                    w.setFullSizeContentView(false);
+                                    w.setTitlebarStyle(WindowMacTitlebarStyle.DEFAULT);
+                                }
+                                case "Hidden" -> {
+                                    window.setTitlebarVisible(false);
+                                    w.setTrafficLightPosition(0, 0);
+                                }
+                                case "Transparent" -> {
+                                    window.setTitlebarVisible(true);
+                                    w.setTitlebarStyle(WindowMacTitlebarStyle.DEFAULT);
+                                    w.setFullSizeContentView(true);
+                                    w.setTrafficLightPosition(0, 0);
+                                }
+                                case "Unified" -> {
+                                    w.setTitlebarStyle(WindowMacTitlebarStyle.UNIFIED);
+                                    w.setFullSizeContentView(false);
+                                }
+                                case "Unified Compact" -> {
+                                    w.setTitlebarStyle(WindowMacTitlebarStyle.UNIFIED_COMPACT);
+                                }
+                                case "Unified Transparent" -> {
+                                    w.setTitlebarStyle(WindowMacTitlebarStyle.UNIFIED);
+                                    w.setFullSizeContentView(true);
+                                }
+                                case "Unified Compact Transparent" -> {
+                                    w.setTitlebarStyle(WindowMacTitlebarStyle.UNIFIED_COMPACT);
+                                }
+                            }
+                            window.focus();
+                        }
+                    }
                 }
             }
         } if (e instanceof EventWindowResize ee) {
@@ -83,10 +123,10 @@ public void paintImpl(Canvas canvas, int width, int height, float scale) {
 
         canvas.save();
         float scale2 = Math.min((width - Example.PADDING * 2) / (maxX - minX),
-                               (height - Example.PADDING * 2) / (maxY - minY));
+                                (height - Example.PADDING * 2) / (maxY - minY));
         canvas.translate(Example.PADDING, Example.PADDING);
         canvas.scale(scale2, scale2);
-        canvas.translate(-minX, -minY);
+        canvas.translate(-minX, (height - Example.PADDING * 2) / scale2 - maxY);
         stroke.setStrokeWidth(1 * scale / scale2);
         for (var screen: App.getScreens()) {
             stroke.setColor(screen.isPrimary() ? 0x80CC3333 : 0x80FFFFFF);
@@ -102,9 +142,17 @@ public void paintImpl(Canvas canvas, int width, int height, float scale) {
 
         var contentRect = window.getContentRect();
         var capHeight = Example.FONT12.getMetrics().getCapHeight();
-        var padding = (int) 8 * scale;
-        canvas.drawString("Position: " + windowRect.getLeft() + ", " + windowRect.getTop(), Example.PADDING, Example.PADDING + capHeight, Example.FONT12, white);
-        canvas.drawString("Window size: " + windowRect.getWidth() + ", " + windowRect.getHeight(), Example.PADDING, Example.PADDING + capHeight * 2 + padding, Example.FONT12, white);
-        canvas.drawString("Content size: " + contentRect.getWidth() + ", " + contentRect.getHeight(), Example.PADDING, Example.PADDING + capHeight * 3 + padding * 2, Example.FONT12, white);
+        var lineHeight = capHeight + (int) 8 * scale;
+        canvas.save();
+        canvas.translate(Example.PADDING, Example.PADDING + capHeight);
+        canvas.drawString("Position: " + windowRect.getLeft() + ", " + windowRect.getTop(), 0, 0, Example.FONT12, white);
+        canvas.translate(0, lineHeight);
+        canvas.drawString("Window size: " + windowRect.getWidth() + ", " + windowRect.getHeight(), 0, 0, Example.FONT12, white);
+        canvas.translate(0, lineHeight);
+        canvas.drawString("Content size: " + contentRect.getWidth() + ", " + contentRect.getHeight(), 0, 0, Example.FONT12, white);
+        canvas.translate(0, lineHeight);
+        canvas.drawString("Titlebar: " + titleStyles.get(), 0, 0, Example.FONT12, white);
+        canvas.translate(0, lineHeight);
+        canvas.restore();
     }
 }
diff --git a/linux/java/WindowX11.java b/linux/java/WindowX11.java
@@ -130,6 +130,13 @@ public Window minimize() {
         return this;
     }
 
+    @Override
+    public Window focus() {
+        assert _onUIThread();
+        // TODO implement
+        return this;
+    }
+
     @Override
     public ZOrder getZOrder() {
         assert _onUIThread();

diff --git a/macos/cc/WindowMac.mm b/macos/cc/WindowMac.mm
@@ -330,13 +330,13 @@ static CVReturn displayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeSt
         case jwm::WindowMacTitlebarStyle::DEFAULT:
             // Just set the toolbar to null
             break;
-        case jwm::WindowMacTitlebarStyle::UNIFIED_SMALL:
+        case jwm::WindowMacTitlebarStyle::UNIFIED:
             toolbar = [[NSToolbar alloc] init];
-            toolbarStyle = NSWindowToolbarStyleUnifiedCompact;
+            toolbarStyle = NSWindowToolbarStyleUnified;
             break;
-        case jwm::WindowMacTitlebarStyle::UNIFIED_LARGE:
+        case jwm::WindowMacTitlebarStyle::UNIFIED_COMPACT:
             toolbar = [[NSToolbar alloc] init];
-            toolbarStyle = NSWindowToolbarStyleUnified;
+            toolbarStyle = NSWindowToolbarStyleUnifiedCompact;
             break;
     }
     [nsWindow setToolbar:toolbar];
@@ -438,6 +438,13 @@ static CVReturn displayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeSt
     }
 }
 
+extern "C" JNIEXPORT void JNICALL Java_io_github_humbleui_jwm_WindowMac__1nFocus
+  (JNIEnv* env, jobject obj) {
+    jwm::WindowMac* instance = reinterpret_cast<jwm::WindowMac*>(jwm::classes::Native::fromJava(env, obj));
+    NSWindow* nsWindow = instance->fNSWindow;
+    [nsWindow makeKeyAndOrderFront:nil];
+}
+
 extern "C" JNIEXPORT jint JNICALL Java_io_github_humbleui_jwm_WindowMac__1nGetZOrder
   (JNIEnv* env, jobject obj) {
     jwm::WindowMac* instance = reinterpret_cast<jwm::WindowMac*>(jwm::classes::Native::fromJava(env, obj));

diff --git a/macos/cc/WindowMacTitlebarStyle.hh b/macos/cc/WindowMacTitlebarStyle.hh
@@ -4,7 +4,7 @@ namespace jwm {
     // must be kept in sync with WindowMacTitlebarStyle.java
     enum class WindowMacTitlebarStyle {
         DEFAULT,
-        UNIFIED_SMALL,
-        UNIFIED_LARGE,
+        UNIFIED,
+        UNIFIED_COMPACT,
     };
 }
diff --git a/macos/java/WindowMac.java b/macos/java/WindowMac.java
@@ -99,6 +99,7 @@ public WindowMac setFullSizeContentView(boolean isFullSizeContentView) {
     public WindowMac setTitlebarStyle(WindowMacTitlebarStyle titlebarStyle) {
         assert _onUIThread();
         _nSetTitlebarStyle(titlebarStyle.ordinal());
+        accept(new EventWindowResize(this));
         return this;
     }
 
@@ -163,6 +164,13 @@ public Window restore() {
         return this;
     }
 
+    @Override
+    public Window focus() {
+        assert _onUIThread();
+        _nFocus();
+        return this;
+    }
+
     @Override
     public ZOrder getZOrder() {
         assert _onUIThread();
@@ -202,6 +210,7 @@ public void close() {
     @ApiStatus.Internal public native void _nMinimize();
     @ApiStatus.Internal public native void _nMaximize();
     @ApiStatus.Internal public native void _nRestore();
+    @ApiStatus.Internal public native void _nFocus();
     @ApiStatus.Internal public native int _nGetZOrder();
     @ApiStatus.Internal public native void _nSetZOrder(int zOrder);
     @ApiStatus.Internal public native void _nClose();

diff --git a/macos/java/WindowMacTitlebarStyle.java b/macos/java/WindowMacTitlebarStyle.java
@@ -4,8 +4,8 @@
 
 public enum WindowMacTitlebarStyle {
     DEFAULT,
-    UNIFIED_SMALL,
-    UNIFIED_LARGE;
+    UNIFIED,
+    UNIFIED_COMPACT;
 
     @ApiStatus.Internal public static final WindowMacTitlebarStyle[] _values = values();
 }
diff --git a/shared/java/Window.java b/shared/java/Window.java
@@ -314,6 +314,13 @@ public Window setVisible(boolean isVisible) {
      */
     public abstract Window restore();
 
+    /**
+     * Focus current window
+     * 
+     * @return  this
+     */
+    public abstract Window focus();
+
     /**
      * @return  current Z order
      */

diff --git a/windows/java/WindowWin32.java b/windows/java/WindowWin32.java
@@ -132,6 +132,13 @@ public Window restore() {
         return this;
     }
 
+    @Override
+    public Window focus() {
+        assert _onUIThread();
+        // TODO implement
+        return this;
+    }
+
     @Override
     public ZOrder getZOrder() {
         assert _onUIThread();