Skip to content

Commit 8abe7d1

Browse files
committed
Reworks
* Rework `ControlItem` and related * Edit documentation * Adjust property, method, and class names to make more sense semantically * Roll back `MenuBarItem` * UI tweaks
1 parent 4c2daaa commit 8abe7d1

17 files changed

+224
-350
lines changed

Diff for: Ice.xcodeproj/project.pbxproj

+21-9
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
1736F7802ADBC02B0073428E /* CustomGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1736F77F2ADBC02B0073428E /* CustomGradient.swift */; };
2020
173C24892B8E80830096F7A1 /* AboutTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = 173C24882B8E80830096F7A1 /* AboutTab.swift */; };
2121
173C248C2B8E821C0096F7A1 /* UpdatesTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = 173C248B2B8E821C0096F7A1 /* UpdatesTab.swift */; };
22-
174AA5D62B71D97100E3FE74 /* MenuBarAppearancePanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 174AA5D52B71D97100E3FE74 /* MenuBarAppearancePanel.swift */; };
22+
174AA5D62B71D97100E3FE74 /* MenuBarOverlayPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 174AA5D52B71D97100E3FE74 /* MenuBarOverlayPanel.swift */; };
2323
174AA5F52B730A0B00E3FE74 /* ScreenCaptureManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 174AA5F42B730A0B00E3FE74 /* ScreenCaptureManager.swift */; };
2424
175061912B1543DD003144CD /* LaunchAtLogin in Frameworks */ = {isa = PBXBuildFile; productRef = 175061902B1543DD003144CD /* LaunchAtLogin */; };
2525
1750850E2B683A4C00CFF13A /* StateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1750850D2B683A4C00CFF13A /* StateView.swift */; };
@@ -30,7 +30,7 @@
3030
175523EC2B92B978005EDF9F /* MenuBarItemManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 175523EB2B92B978005EDF9F /* MenuBarItemManager.swift */; };
3131
175584122B541CFC00EDC9D3 /* CustomTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 175584112B541CFC00EDC9D3 /* CustomTabView.swift */; };
3232
175584152B541D6F00EDC9D3 /* MenuBarLayoutTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = 175584142B541D6F00EDC9D3 /* MenuBarLayoutTab.swift */; };
33-
175812542B80FBFA00D622DA /* MenuBarAppearanceEditorHelperPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 175812532B80FBFA00D622DA /* MenuBarAppearanceEditorHelperPanel.swift */; };
33+
175812542B80FBFA00D622DA /* MenuBarAppearanceEditorPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 175812532B80FBFA00D622DA /* MenuBarAppearanceEditorPanel.swift */; };
3434
175812592B82ACA900D622DA /* Annotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 175812582B82ACA800D622DA /* Annotation.swift */; };
3535
176B23F42ADB76A1008AE86B /* CustomColorPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 176B23F32ADB76A1008AE86B /* CustomColorPicker.swift */; };
3636
177354662B1B8502001CF731 /* MenuBarShape.swift in Sources */ = {isa = PBXBuildFile; fileRef = 177354652B1B8502001CF731 /* MenuBarShape.swift */; };
@@ -52,6 +52,7 @@
5252
179F13BA2B90D34800EC6B52 /* MenuBarAppearanceConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 179F13B92B90D34800EC6B52 /* MenuBarAppearanceConfiguration.swift */; };
5353
179F3C432ACE746700A76EE8 /* RemoveSidebarToggle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 179F3C422ACE746700A76EE8 /* RemoveSidebarToggle.swift */; };
5454
17AB36292B9F5A5D00F50C0F /* SecondaryAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17AB36282B9F5A5D00F50C0F /* SecondaryAction.swift */; };
55+
17AB36322BA081D800F50C0F /* NSImage+resized.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17AB36312BA081D800F50C0F /* NSImage+resized.swift */; };
5556
17B331D02B9916E70084EBB0 /* SettingsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17B331CF2B9916E70084EBB0 /* SettingsManager.swift */; };
5657
17B331D32B991D290084EBB0 /* GeneralSettingsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17B331D22B991D290084EBB0 /* GeneralSettingsManager.swift */; };
5758
17B331D52B991D8D0084EBB0 /* AdvancedSettingsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17B331D42B991D8D0084EBB0 /* AdvancedSettingsManager.swift */; };
@@ -119,7 +120,7 @@
119120
1736F77F2ADBC02B0073428E /* CustomGradient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomGradient.swift; sourceTree = "<group>"; };
120121
173C24882B8E80830096F7A1 /* AboutTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutTab.swift; sourceTree = "<group>"; };
121122
173C248B2B8E821C0096F7A1 /* UpdatesTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdatesTab.swift; sourceTree = "<group>"; };
122-
174AA5D52B71D97100E3FE74 /* MenuBarAppearancePanel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuBarAppearancePanel.swift; sourceTree = "<group>"; };
123+
174AA5D52B71D97100E3FE74 /* MenuBarOverlayPanel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuBarOverlayPanel.swift; sourceTree = "<group>"; };
123124
174AA5F42B730A0B00E3FE74 /* ScreenCaptureManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScreenCaptureManager.swift; sourceTree = "<group>"; };
124125
1750850D2B683A4C00CFF13A /* StateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StateView.swift; sourceTree = "<group>"; };
125126
175085122B69C4C100CFF13A /* CustomTabBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTabBuilder.swift; sourceTree = "<group>"; };
@@ -129,7 +130,7 @@
129130
175523EB2B92B978005EDF9F /* MenuBarItemManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuBarItemManager.swift; sourceTree = "<group>"; };
130131
175584112B541CFC00EDC9D3 /* CustomTabView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomTabView.swift; sourceTree = "<group>"; };
131132
175584142B541D6F00EDC9D3 /* MenuBarLayoutTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuBarLayoutTab.swift; sourceTree = "<group>"; };
132-
175812532B80FBFA00D622DA /* MenuBarAppearanceEditorHelperPanel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuBarAppearanceEditorHelperPanel.swift; sourceTree = "<group>"; };
133+
175812532B80FBFA00D622DA /* MenuBarAppearanceEditorPanel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuBarAppearanceEditorPanel.swift; sourceTree = "<group>"; };
133134
175812582B82ACA800D622DA /* Annotation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Annotation.swift; sourceTree = "<group>"; };
134135
176B23F32ADB76A1008AE86B /* CustomColorPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomColorPicker.swift; sourceTree = "<group>"; };
135136
177354652B1B8502001CF731 /* MenuBarShape.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuBarShape.swift; sourceTree = "<group>"; };
@@ -150,6 +151,7 @@
150151
179F13B92B90D34800EC6B52 /* MenuBarAppearanceConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuBarAppearanceConfiguration.swift; sourceTree = "<group>"; };
151152
179F3C422ACE746700A76EE8 /* RemoveSidebarToggle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoveSidebarToggle.swift; sourceTree = "<group>"; };
152153
17AB36282B9F5A5D00F50C0F /* SecondaryAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecondaryAction.swift; sourceTree = "<group>"; };
154+
17AB36312BA081D800F50C0F /* NSImage+resized.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSImage+resized.swift"; sourceTree = "<group>"; };
153155
17B331CF2B9916E70084EBB0 /* SettingsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsManager.swift; sourceTree = "<group>"; };
154156
17B331D22B991D290084EBB0 /* GeneralSettingsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralSettingsManager.swift; sourceTree = "<group>"; };
155157
17B331D42B991D8D0084EBB0 /* AdvancedSettingsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdvancedSettingsManager.swift; sourceTree = "<group>"; };
@@ -424,15 +426,23 @@
424426
isa = PBXGroup;
425427
children = (
426428
179F13B92B90D34800EC6B52 /* MenuBarAppearanceConfiguration.swift */,
427-
175812532B80FBFA00D622DA /* MenuBarAppearanceEditorHelperPanel.swift */,
429+
175812532B80FBFA00D622DA /* MenuBarAppearanceEditorPanel.swift */,
428430
17B7F32A2B264C1800CDCF49 /* MenuBarAppearanceManager.swift */,
429-
174AA5D52B71D97100E3FE74 /* MenuBarAppearancePanel.swift */,
431+
174AA5D52B71D97100E3FE74 /* MenuBarOverlayPanel.swift */,
430432
177354652B1B8502001CF731 /* MenuBarShape.swift */,
431433
1787C43A2B187187002F50DF /* MenuBarTintKind.swift */,
432434
);
433435
path = MenuBarAppearance;
434436
sourceTree = "<group>";
435437
};
438+
17AB36302BA081C400F50C0F /* NSImage */ = {
439+
isa = PBXGroup;
440+
children = (
441+
17AB36312BA081D800F50C0F /* NSImage+resized.swift */,
442+
);
443+
path = NSImage;
444+
sourceTree = "<group>";
445+
};
436446
17B331D12B991D180084EBB0 /* SettingsManagers */ = {
437447
isa = PBXGroup;
438448
children = (
@@ -572,6 +582,7 @@
572582
7150A7AB2AA4262F0045EA68 /* Hotkeys */,
573583
17C261E72B5AEB7A0076F129 /* Main */,
574584
7166834E2A768190006ABF84 /* MenuBar */,
585+
179F13BC2B91E7F700EC6B52 /* MenuBarAppearance */,
575586
1787C42A2B16ADF2002F50DF /* Permissions */,
576587
170749BF2B11A2BB009DDF73 /* Resources */,
577588
7133ED662A858230000A7E1B /* Settings */,
@@ -613,6 +624,7 @@
613624
716683442A76811C006ABF84 /* Logger */,
614625
7133ED5F2A855ADA000A7E1B /* NSApplication */,
615626
177354822B1F9AE1001CF731 /* NSBezierPath */,
627+
17AB36302BA081C400F50C0F /* NSImage */,
616628
17C3C5F52B75A35000B9648C /* NSScreen */,
617629
716683462A76811C006ABF84 /* NSStatusItem */,
618630
17CC22B62B8B561F001A0582 /* RectangleCornerRadii */,
@@ -644,7 +656,6 @@
644656
7166834F2A7681AF006ABF84 /* MenuBarManager.swift */,
645657
7162406E2AA0A323003EC671 /* MenuBarSection.swift */,
646658
17F71BB12B87E37800905CBA /* RehideStrategy.swift */,
647-
179F13BC2B91E7F700EC6B52 /* MenuBarAppearance */,
648659
);
649660
path = MenuBar;
650661
sourceTree = "<group>";
@@ -831,20 +842,21 @@
831842
17CC22BC2B8CDE6F001A0582 /* EventManager.swift in Sources */,
832843
71623BD32A8B6744002FD331 /* CustomButtonStyle.swift in Sources */,
833844
7133ED712A85AE6A000A7E1B /* SettingsNavigationItem.swift in Sources */,
834-
174AA5D62B71D97100E3FE74 /* MenuBarAppearancePanel.swift in Sources */,
845+
174AA5D62B71D97100E3FE74 /* MenuBarOverlayPanel.swift in Sources */,
835846
71008DF02AB907B00036B1F3 /* ObjectAssociation.swift in Sources */,
836847
179F3C432ACE746700A76EE8 /* RemoveSidebarToggle.swift in Sources */,
837848
17DFF4AC2AD5FB3300B5177A /* MenuBarSettingsPane.swift in Sources */,
838849
170423DD2B56E77D004A2549 /* UpdatesManager.swift in Sources */,
839850
177354662B1B8502001CF731 /* MenuBarShape.swift in Sources */,
840851
71D36C4F2A88FE4900D89CD5 /* SettingsWindow.swift in Sources */,
841852
175812592B82ACA900D622DA /* Annotation.swift in Sources */,
853+
17AB36322BA081D800F50C0F /* NSImage+resized.swift in Sources */,
842854
71604D632AAE84ED002FE96F /* ErrorOverlay.swift in Sources */,
843855
1787C4302B16AE78002F50DF /* PermissionsManager.swift in Sources */,
844856
17E2EA652B89531800974E60 /* NSScreen+isMouseInMenuBar.swift in Sources */,
845857
170CF88C2B0ED4FA0073F982 /* HotkeyRecordingFailure.swift in Sources */,
846858
170CF88E2B0EDD780073F982 /* LocalizedErrorBox.swift in Sources */,
847-
175812542B80FBFA00D622DA /* MenuBarAppearanceEditorHelperPanel.swift in Sources */,
859+
175812542B80FBFA00D622DA /* MenuBarAppearanceEditorPanel.swift in Sources */,
848860
7166832E2A767E6A006ABF84 /* IceApp.swift in Sources */,
849861
71FEA2502A8D5D590048341A /* HotkeyRecorder.swift in Sources */,
850862
17C3C5F72B75A36100B9648C /* NSScreen+displayID.swift in Sources */,

0 commit comments

Comments
 (0)