Skip to content

Commit 1b8224d

Browse files
committed
Pre-release 0.25.82
1 parent c599826 commit 1b8224d

File tree

6 files changed

+22
-14
lines changed

6 files changed

+22
-14
lines changed

Core/Sources/HostApp/GeneralView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ struct CopilotConnectionView: View {
260260

261261
var connection: some View {
262262
VStack(alignment: .leading) {
263-
Text(StringConstants.copilotResources)
263+
Text(StringConstants.copilotConnection)
264264
.bold()
265265
.padding(.leading, 8)
266266
VStack(spacing: .zero) {

Core/Sources/HostApp/StringConstants.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ struct StringConstants {
1616
static let turnOnCopilot = "Turn on Copilot for Xcode"
1717
static let turnOffAlertTitle = "Turn off Copilot for Xcode"
1818
static let turnOffAlertMessage = "If you turn off Copilot for Xcode, all features will be disabled."
19+
static let copilotConnection = "Copilot Connection"
1920
static let githubAccountStatus = "Github Account Status Permissions"
2021
static let githubConnection = "Github Connection:"
2122
static let refreshConnection = "Refresh Connection"

Core/Sources/SuggestionWidget/ChatPanelWindow.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,13 @@ final class ChatPanelWindow: NSWindow {
3838
isReleasedWhenClosed = false
3939
isOpaque = false
4040
backgroundColor = .clear
41-
level = .init(NSWindow.Level.floating.rawValue + 1)
41+
level = widgetLevel(1)
4242
collectionBehavior = [
4343
.fullScreenAuxiliary,
4444
.transient,
4545
.fullScreenPrimary,
4646
.fullScreenAllowsTiling,
47+
.canJoinAllSpaces
4748
]
4849
hasShadow = true
4950
contentView = NSHostingView(

Core/Sources/SuggestionWidget/WidgetWindowsController.swift

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ public final class WidgetWindows {
634634
it.isOpaque = false
635635
it.backgroundColor = .clear
636636
it.level = .floating
637-
it.collectionBehavior = [.fullScreenAuxiliary, .transient]
637+
it.collectionBehavior = [.fullScreenAuxiliary, .transient, .canJoinAllSpaces]
638638
it.hasShadow = true
639639
it.contentView = NSHostingView(
640640
rootView: WidgetView(
@@ -660,8 +660,8 @@ public final class WidgetWindows {
660660
it.isReleasedWhenClosed = false
661661
it.isOpaque = false
662662
it.backgroundColor = .clear
663-
it.level = .init(NSWindow.Level.floating.rawValue + 2)
664-
it.collectionBehavior = [.fullScreenAuxiliary, .transient]
663+
it.level = widgetLevel(2)
664+
it.collectionBehavior = [.fullScreenAuxiliary, .transient, .canJoinAllSpaces]
665665
it.hasShadow = true
666666
it.contentView = NSHostingView(
667667
rootView: SharedPanelView(
@@ -694,8 +694,8 @@ public final class WidgetWindows {
694694
it.isReleasedWhenClosed = false
695695
it.isOpaque = false
696696
it.backgroundColor = .clear
697-
it.level = .init(NSWindow.Level.floating.rawValue + 2)
698-
it.collectionBehavior = [.fullScreenAuxiliary, .transient]
697+
it.level = widgetLevel(2)
698+
it.collectionBehavior = [.fullScreenAuxiliary, .transient, .canJoinAllSpaces]
699699
it.hasShadow = false
700700
it.contentView = NSHostingView(
701701
rootView: SuggestionPanelView(
@@ -741,8 +741,8 @@ public final class WidgetWindows {
741741
it.isReleasedWhenClosed = false
742742
it.isOpaque = true
743743
it.backgroundColor = .clear
744-
it.level = .floating
745-
it.collectionBehavior = [.fullScreenAuxiliary, .transient]
744+
it.level = widgetLevel(0)
745+
it.collectionBehavior = [.fullScreenAuxiliary, .transient, .canJoinAllSpaces]
746746
it.hasShadow = false
747747
it.contentView = NSHostingView(
748748
rootView: ToastPanelView(store: store.scope(
@@ -784,3 +784,9 @@ class CanBecomeKeyWindow: NSWindow {
784784
override var canBecomeMain: Bool { canBecomeKeyChecker() }
785785
}
786786

787+
func widgetLevel(_ addition: Int) -> NSWindow.Level {
788+
let minimumWidgetLevel: Int
789+
minimumWidgetLevel = NSWindow.Level.floating.rawValue
790+
return .init(minimumWidgetLevel + addition)
791+
}
792+

Server/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"description": "Package for downloading @github/copilot-language-server",
55
"private": true,
66
"dependencies": {
7-
"@github/copilot-language-server": "^1.236.0"
7+
"@github/copilot-language-server": "^1.237.0"
88
}
99
}

0 commit comments

Comments
 (0)