Skip to content

Commit 83b7079

Browse files
dklaver15dklaver15
authored
Rename OverlayPanel and OverlayView classes (#1653)
* Renamed the OverlayPanel class to SearchPanel * Renamed the OverlayView class to SearchPanelView
1 parent f6d82b6 commit 83b7079

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

‎CodeEdit.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
587B9DA029300ABD00AC7927 /* PanelDivider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587B9D8929300ABD00AC7927 /* PanelDivider.swift */; };
126126
587B9DA229300ABD00AC7927 /* EffectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587B9D8B29300ABD00AC7927 /* EffectView.swift */; };
127127
587B9DA329300ABD00AC7927 /* SettingsTextEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587B9D8C29300ABD00AC7927 /* SettingsTextEditor.swift */; };
128-
587B9DA429300ABD00AC7927 /* OverlayPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587B9D8D29300ABD00AC7927 /* OverlayPanel.swift */; };
128+
587B9DA429300ABD00AC7927 /* SearchPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587B9D8D29300ABD00AC7927 /* SearchPanel.swift */; };
129129
587B9DA529300ABD00AC7927 /* PressActionsModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587B9D8E29300ABD00AC7927 /* PressActionsModifier.swift */; };
130130
587B9DA629300ABD00AC7927 /* ToolbarBranchPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587B9D8F29300ABD00AC7927 /* ToolbarBranchPicker.swift */; };
131131
587B9DA729300ABD00AC7927 /* HelpButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587B9D9029300ABD00AC7927 /* HelpButton.swift */; };
@@ -347,7 +347,7 @@
347347
6CAAF69229BCC71C00A1F48A /* (null) in Sources */ = {isa = PBXBuildFile; };
348348
6CAAF69429BCD78600A1F48A /* (null) in Sources */ = {isa = PBXBuildFile; };
349349
6CABB19E29C5591D00340467 /* NSTableViewWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CABB19C29C5591D00340467 /* NSTableViewWrapper.swift */; };
350-
6CABB1A129C5593800340467 /* OverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CABB1A029C5593800340467 /* OverlayView.swift */; };
350+
6CABB1A129C5593800340467 /* SearchPanelView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CABB1A029C5593800340467 /* SearchPanelView.swift */; };
351351
6CB446402B6DFF3A00539ED0 /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6CB4463F2B6DFF3A00539ED0 /* CodeEditSourceEditor */; };
352352
6CB52DC92AC8DC3E002E75B3 /* CEWorkspaceFileManager+FileManagement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CB52DC82AC8DC3E002E75B3 /* CEWorkspaceFileManager+FileManagement.swift */; };
353353
6CB9144B29BEC7F100BC47F2 /* (null) in Sources */ = {isa = PBXBuildFile; };
@@ -666,7 +666,7 @@
666666
587B9D8929300ABD00AC7927 /* PanelDivider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PanelDivider.swift; sourceTree = "<group>"; };
667667
587B9D8B29300ABD00AC7927 /* EffectView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EffectView.swift; sourceTree = "<group>"; };
668668
587B9D8C29300ABD00AC7927 /* SettingsTextEditor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTextEditor.swift; sourceTree = "<group>"; };
669-
587B9D8D29300ABD00AC7927 /* OverlayPanel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OverlayPanel.swift; sourceTree = "<group>"; };
669+
587B9D8D29300ABD00AC7927 /* SearchPanel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchPanel.swift; sourceTree = "<group>"; };
670670
587B9D8E29300ABD00AC7927 /* PressActionsModifier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PressActionsModifier.swift; sourceTree = "<group>"; };
671671
587B9D8F29300ABD00AC7927 /* ToolbarBranchPicker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ToolbarBranchPicker.swift; sourceTree = "<group>"; };
672672
587B9D9029300ABD00AC7927 /* HelpButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HelpButton.swift; sourceTree = "<group>"; };
@@ -876,7 +876,7 @@
876876
6C97EBCB2978760400302F95 /* AcknowledgementsWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AcknowledgementsWindowController.swift; sourceTree = "<group>"; };
877877
6CA1AE942B46950000378EAB /* EditorInstance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorInstance.swift; sourceTree = "<group>"; };
878878
6CABB19C29C5591D00340467 /* NSTableViewWrapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NSTableViewWrapper.swift; path = CodeEdit/Features/QuickOpen/Views/NSTableViewWrapper.swift; sourceTree = SOURCE_ROOT; };
879-
6CABB1A029C5593800340467 /* OverlayView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OverlayView.swift; sourceTree = "<group>"; };
879+
6CABB1A029C5593800340467 /* SearchPanelView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchPanelView.swift; sourceTree = "<group>"; };
880880
6CB52DC82AC8DC3E002E75B3 /* CEWorkspaceFileManager+FileManagement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CEWorkspaceFileManager+FileManagement.swift"; sourceTree = "<group>"; };
881881
6CBA0D502A1BF524002C6FAA /* SegmentedControlImproved.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SegmentedControlImproved.swift; sourceTree = "<group>"; };
882882
6CBD1BC52978DE53006639D5 /* Font+Caption3.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Font+Caption3.swift"; sourceTree = "<group>"; };
@@ -1746,8 +1746,8 @@
17461746
587B9D9029300ABD00AC7927 /* HelpButton.swift */,
17471747
B67DB0F82AFDF638002DC647 /* IconButtonStyle.swift */,
17481748
B67DB0FB2AFDF71F002DC647 /* IconToggleStyle.swift */,
1749-
587B9D8D29300ABD00AC7927 /* OverlayPanel.swift */,
1750-
6CABB1A029C5593800340467 /* OverlayView.swift */,
1749+
587B9D8D29300ABD00AC7927 /* SearchPanel.swift */,
1750+
6CABB1A029C5593800340467 /* SearchPanelView.swift */,
17511751
587B9D8929300ABD00AC7927 /* PanelDivider.swift */,
17521752
B67DB0EE2AF3E381002DC647 /* PaneTextField.swift */,
17531753
587B9D8E29300ABD00AC7927 /* PressActionsModifier.swift */,
@@ -3383,7 +3383,7 @@
33833383
04540D5E27DD08C300E91B77 /* WorkspaceView.swift in Sources */,
33843384
DE6F77872813625500D00A76 /* EditorTabBarDivider.swift in Sources */,
33853385
6111920C2B08CD0B00D4459B /* SearchIndexer+InternalMethods.swift in Sources */,
3386-
6CABB1A129C5593800340467 /* OverlayView.swift in Sources */,
3386+
6CABB1A129C5593800340467 /* SearchPanelView.swift in Sources */,
33873387
D7211D4327E066CE008F2ED7 /* Localized+Ex.swift in Sources */,
33883388
581BFB692926431000D251EC /* WelcomeActionView.swift in Sources */,
33893389
20D839AE280E0CA700B27357 /* HistoryPopoverView.swift in Sources */,
@@ -3421,7 +3421,7 @@
34213421
61538B902B111FE800A88846 /* String+AppearancesOfSubstring.swift in Sources */,
34223422
581BFB6B2926431000D251EC /* RecentProjectItem.swift in Sources */,
34233423
587FB99029C1246400B519DD /* EditorTabView.swift in Sources */,
3424-
587B9DA429300ABD00AC7927 /* OverlayPanel.swift in Sources */,
3424+
587B9DA429300ABD00AC7927 /* SearchPanel.swift in Sources */,
34253425
58D01C95293167DC00C5B6B4 /* Bundle+Info.swift in Sources */,
34263426
B6C6A42A297716A500A3D28F /* EditorTabCloseButton.swift in Sources */,
34273427
B60718422B17DB93009CDAB4 /* SourceControlNavigatorRepositoryView+outlineGroupData.swift in Sources */,

‎CodeEdit/Features/CodeEditUI/Views/OverlayPanel.swift renamed to ‎CodeEdit/Features/CodeEditUI/Views/SearchPanel.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import Cocoa
99

10-
final class OverlayPanel: NSPanel, NSWindowDelegate {
10+
final class SearchPanel: NSPanel, NSWindowDelegate {
1111
init() {
1212
super.init(
1313
contentRect: NSRect(x: 0, y: 0, width: 500, height: 48),
@@ -27,7 +27,7 @@ final class OverlayPanel: NSPanel, NSWindowDelegate {
2727
}
2828

2929
func windowDidResignKey(_ notification: Notification) {
30-
if let panel = notification.object as? OverlayPanel {
30+
if let panel = notification.object as? SearchPanel {
3131
panel.close()
3232
}
3333
}

‎CodeEdit/Features/CodeEditUI/Views/OverlayView.swift renamed to ‎CodeEdit/Features/CodeEditUI/Views/SearchPanelView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import Foundation
99
import SwiftUI
1010

11-
struct OverlayView<RowView: View, PreviewView: View, Option: Identifiable & Hashable>: View {
11+
struct SearchPanelView<RowView: View, PreviewView: View, Option: Identifiable & Hashable>: View {
1212
@ViewBuilder let rowViewBuilder: ((Option) -> RowView)
1313
@ViewBuilder let previewViewBuilder: ((Option) -> PreviewView)?
1414

‎CodeEdit/Features/Commands/Views/CommandPaletteView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ struct CommandPaletteView: View {
4343
}
4444

4545
var body: some View {
46-
OverlayView<SearchResultLabel, EmptyView, Command>(
46+
SearchPanelView<SearchResultLabel, EmptyView, Command>(
4747
title: "Commands",
4848
image: Image(systemName: "magnifyingglass"),
4949
options: $state.filteredCommands,

‎CodeEdit/Features/Documents/Controllers/CodeEditWindowController.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate, Obs
1818
var observers: [NSKeyValueObservation] = []
1919

2020
var workspace: WorkspaceDocument?
21-
var quickOpenPanel: OverlayPanel?
22-
var commandPalettePanel: OverlayPanel?
21+
var quickOpenPanel: SearchPanel?
22+
var commandPalettePanel: SearchPanel?
2323
var navigatorSidebarViewModel: NavigatorSidebarViewModel?
2424

2525
var splitViewController: NSSplitViewController!
@@ -242,7 +242,7 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate, Obs
242242
commandPalettePanel.makeKeyAndOrderFront(self)
243243
}
244244
} else {
245-
let panel = OverlayPanel()
245+
let panel = SearchPanel()
246246
self.commandPalettePanel = panel
247247
let contentView = CommandPaletteView(state: state, closePalette: panel.close)
248248
panel.contentView = NSHostingView(rootView: SettingsInjector { contentView })
@@ -263,7 +263,7 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate, Obs
263263
quickOpenPanel.makeKeyAndOrderFront(self)
264264
}
265265
} else {
266-
let panel = OverlayPanel()
266+
let panel = SearchPanel()
267267
self.quickOpenPanel = panel
268268

269269
let contentView = QuickOpenView(state: state) {

‎CodeEdit/Features/QuickOpen/Views/QuickOpenView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ struct QuickOpenView: View {
3434
}
3535

3636
var body: some View {
37-
OverlayView(
37+
SearchPanelView(
3838
title: "Open Quickly",
3939
image: Image(systemName: "magnifyingglass"),
4040
options: $state.openQuicklyFiles,

0 commit comments

Comments
 (0)