Pre-release 0.25.82

github · Oct 10, 2024 · 1b8224d · 1b8224d
1 parent c599826
commit 1b8224d
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 14 deletions.
diff --git a/Core/Sources/HostApp/GeneralView.swift b/Core/Sources/HostApp/GeneralView.swift
@@ -260,7 +260,7 @@ struct CopilotConnectionView: View {
 
     var connection: some View {
         VStack(alignment: .leading) {
-            Text(StringConstants.copilotResources)
+            Text(StringConstants.copilotConnection)
                 .bold()
                 .padding(.leading, 8)
             VStack(spacing: .zero) {

diff --git a/Core/Sources/HostApp/StringConstants.swift b/Core/Sources/HostApp/StringConstants.swift
@@ -16,6 +16,7 @@ struct StringConstants {
     static let turnOnCopilot = "Turn on Copilot for Xcode"
     static let turnOffAlertTitle = "Turn off Copilot for Xcode"
     static let turnOffAlertMessage = "If you turn off Copilot for Xcode, all features will be disabled."
+    static let copilotConnection = "Copilot Connection"
     static let githubAccountStatus = "Github Account Status Permissions"
     static let githubConnection = "Github Connection:"
     static let refreshConnection = "Refresh Connection"

diff --git a/Core/Sources/SuggestionWidget/ChatPanelWindow.swift b/Core/Sources/SuggestionWidget/ChatPanelWindow.swift
@@ -38,12 +38,13 @@ final class ChatPanelWindow: NSWindow {
         isReleasedWhenClosed = false
         isOpaque = false
         backgroundColor = .clear
-        level = .init(NSWindow.Level.floating.rawValue + 1)
+        level = widgetLevel(1)
         collectionBehavior = [
             .fullScreenAuxiliary,
             .transient,
             .fullScreenPrimary,
             .fullScreenAllowsTiling,
+            .canJoinAllSpaces
         ]
         hasShadow = true
         contentView = NSHostingView(

diff --git a/Core/Sources/SuggestionWidget/WidgetWindowsController.swift b/Core/Sources/SuggestionWidget/WidgetWindowsController.swift
@@ -634,7 +634,7 @@ public final class WidgetWindows {
         it.isOpaque = false
         it.backgroundColor = .clear
         it.level = .floating
-        it.collectionBehavior = [.fullScreenAuxiliary, .transient]
+        it.collectionBehavior = [.fullScreenAuxiliary, .transient, .canJoinAllSpaces]
         it.hasShadow = true
         it.contentView = NSHostingView(
             rootView: WidgetView(
@@ -660,8 +660,8 @@ public final class WidgetWindows {
         it.isReleasedWhenClosed = false
         it.isOpaque = false
         it.backgroundColor = .clear
-        it.level = .init(NSWindow.Level.floating.rawValue + 2)
-        it.collectionBehavior = [.fullScreenAuxiliary, .transient]
+        it.level = widgetLevel(2)
+        it.collectionBehavior = [.fullScreenAuxiliary, .transient, .canJoinAllSpaces]
         it.hasShadow = true
         it.contentView = NSHostingView(
             rootView: SharedPanelView(
@@ -694,8 +694,8 @@ public final class WidgetWindows {
         it.isReleasedWhenClosed = false
         it.isOpaque = false
         it.backgroundColor = .clear
-        it.level = .init(NSWindow.Level.floating.rawValue + 2)
-        it.collectionBehavior = [.fullScreenAuxiliary, .transient]
+        it.level = widgetLevel(2)
+        it.collectionBehavior = [.fullScreenAuxiliary, .transient, .canJoinAllSpaces]
         it.hasShadow = false
         it.contentView = NSHostingView(
             rootView: SuggestionPanelView(
@@ -741,8 +741,8 @@ public final class WidgetWindows {
         it.isReleasedWhenClosed = false
         it.isOpaque = true
         it.backgroundColor = .clear
-        it.level = .floating
-        it.collectionBehavior = [.fullScreenAuxiliary, .transient]
+        it.level = widgetLevel(0)
+        it.collectionBehavior = [.fullScreenAuxiliary, .transient, .canJoinAllSpaces]
         it.hasShadow = false
         it.contentView = NSHostingView(
             rootView: ToastPanelView(store: store.scope(
@@ -784,3 +784,9 @@ class CanBecomeKeyWindow: NSWindow {
     override var canBecomeMain: Bool { canBecomeKeyChecker() }
 }
 
+func widgetLevel(_ addition: Int) -> NSWindow.Level {
+    let minimumWidgetLevel: Int
+    minimumWidgetLevel = NSWindow.Level.floating.rawValue
+    return .init(minimumWidgetLevel + addition)
+}
+
diff --git a/Server/package-lock.json b/Server/package-lock.json
diff --git a/Server/package.json b/Server/package.json
@@ -4,6 +4,6 @@
   "description": "Package for downloading @github/copilot-language-server",
   "private": true,
   "dependencies": {
-    "@github/copilot-language-server": "^1.236.0"
+    "@github/copilot-language-server": "^1.237.0"
   }
 }