Skip to content

Commit b9662c0

Browse files
committed
Merge branch 'release/0.37.4'
2 parents 0b29559 + f524675 commit b9662c0

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

Core/Sources/SuggestionWidget/ChatPanelWindow.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,7 @@ final class ChatPanelWindow: WidgetWindow {
5151
}())
5252
titlebarAppearsTransparent = true
5353
isReleasedWhenClosed = false
54-
isOpaque = false
55-
backgroundColor = .clear
5654
level = widgetLevel(1)
57-
5855
hasShadow = true
5956
contentView = NSHostingView(
6057
rootView: ChatWindowView(

Core/Sources/SuggestionWidget/WidgetWindowsController.swift

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,6 @@ extension WidgetWindowsController {
479479
)
480480

481481
if let suggestionPanelLocation = widgetLocation.suggestionPanelLocation {
482-
print(suggestionPanelLocation)
483482
windows.suggestionPanelWindow.setFrame(
484483
suggestionPanelLocation.frame,
485484
display: false,
@@ -705,7 +704,7 @@ public final class WidgetWindows {
705704
defer: false
706705
)
707706
it.isReleasedWhenClosed = false
708-
it.isOpaque = false
707+
it.isOpaque = true
709708
it.backgroundColor = .clear
710709
it.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .transient]
711710
it.hasShadow = false
@@ -723,10 +722,10 @@ public final class WidgetWindows {
723722
defer: false
724723
)
725724
it.isReleasedWhenClosed = false
726-
it.isOpaque = false
725+
it.isOpaque = true
727726
it.backgroundColor = .clear
728727
it.level = widgetLevel(0)
729-
it.hasShadow = true
728+
it.hasShadow = false
730729
it.contentView = NSHostingView(
731730
rootView: WidgetView(
732731
store: store.scope(
@@ -749,11 +748,11 @@ public final class WidgetWindows {
749748
defer: false
750749
)
751750
it.isReleasedWhenClosed = false
752-
it.isOpaque = false
751+
it.isOpaque = true
753752
it.backgroundColor = .clear
754753
it.level = widgetLevel(2)
755754
it.hoveringLevel = widgetLevel(2)
756-
it.hasShadow = true
755+
it.hasShadow = false
757756
it.contentView = NSHostingView(
758757
rootView: SharedPanelView(
759758
store: store.scope(
@@ -783,10 +782,12 @@ public final class WidgetWindows {
783782
defer: false
784783
)
785784
it.isReleasedWhenClosed = false
786-
it.isOpaque = false
785+
it.isOpaque = true
787786
it.backgroundColor = .clear
788787
it.level = widgetLevel(2)
789-
it.hasShadow = true
788+
it.hasShadow = false
789+
it.menu = nil
790+
it.animationBehavior = .utilityWindow
790791
it.contentView = NSHostingView(
791792
rootView: SuggestionPanelView(
792793
store: store.scope(
@@ -881,6 +882,8 @@ class WidgetWindow: CanBecomeKeyWindow {
881882
}
882883

883884
var hoveringLevel: NSWindow.Level = widgetLevel(0)
885+
886+
override var isFloatingPanel: Bool { true }
884887

885888
var defaultCollectionBehavior: NSWindow.CollectionBehavior {
886889
[.fullScreenAuxiliary, .transient]

OverlayWindow/Sources/OverlayWindow/OverlayPanel.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import AppKit
2+
import Logger
23
import Perception
34
import SwiftUI
4-
import Logger
55

66
struct OverlayFrameEnvironmentKey: EnvironmentKey {
77
static let defaultValue: CGRect = .zero
@@ -24,7 +24,7 @@ public extension EnvironmentValues {
2424
}
2525

2626
@MainActor
27-
final class OverlayPanel: NSPanel {
27+
public final class OverlayPanel: NSPanel {
2828
@MainActor
2929
@Perceptible
3030
final class PanelState {
@@ -35,7 +35,7 @@ final class OverlayPanel: NSPanel {
3535
let panelState: PanelState = .init()
3636
private var _canBecomeKey = true
3737

38-
init<Content: View>(
38+
public init<Content: View>(
3939
contentRect: NSRect,
4040
@ViewBuilder content: @escaping () -> Content
4141
) {
@@ -52,9 +52,9 @@ final class OverlayPanel: NSPanel {
5252

5353
isReleasedWhenClosed = false
5454
menu = nil
55-
isOpaque = false
55+
isOpaque = true
5656
backgroundColor = .clear
57-
hasShadow = true
57+
hasShadow = false
5858
alphaValue = 1.0
5959
collectionBehavior = [.fullScreenAuxiliary]
6060
isFloatingPanel = true
@@ -71,21 +71,21 @@ final class OverlayPanel: NSPanel {
7171
)
7272
}
7373

74-
override var canBecomeKey: Bool {
74+
override public var canBecomeKey: Bool {
7575
return _canBecomeKey
7676
}
7777

78-
override var canBecomeMain: Bool {
78+
override public var canBecomeMain: Bool {
7979
return false
8080
}
81-
82-
override func setIsVisible(_ visible: Bool) {
81+
82+
override public func setIsVisible(_ visible: Bool) {
8383
_canBecomeKey = false
8484
defer { _canBecomeKey = true }
8585
super.setIsVisible(visible)
8686
}
8787

88-
func moveToActiveSpace() {
88+
public func moveToActiveSpace() {
8989
collectionBehavior = [.fullScreenAuxiliary, .moveToActiveSpace]
9090
Task { @MainActor in
9191
try await Task.sleep(nanoseconds: 50_000_000)

Version.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
APP_VERSION = 0.37.3
2-
APP_BUILD = 492
1+
APP_VERSION = 0.37.4
2+
APP_BUILD = 494
33
RELEASE_CHANNEL =
44
RELEASE_NUMBER = 1

0 commit comments

Comments
 (0)