@@ -23,9 +23,6 @@ struct EditorTabView: View {
2323
2424 @EnvironmentObject private var editorManager : EditorManager
2525
26- @AppSettings ( \. general. tabBarStyle)
27- var tabBarStyle
28-
2926 @AppSettings ( \. general. fileIconStyle)
3027 var fileIconStyle
3128
@@ -46,9 +43,6 @@ struct EditorTabView: View {
4643 /// By default, this value is `false`. When the root view is appeared, it turns `true`.
4744 @State private var isAppeared : Bool = false
4845
49- /// The expected tab width in native tab bar style.
50- private var expectedWidth : CGFloat
51-
5246 /// The id associating with the tab that is currently being dragged.
5347 ///
5448 /// When `nil`, then there is no tab being dragged.
@@ -108,14 +102,12 @@ struct EditorTabView: View {
108102 }
109103
110104 init (
111- expectedWidth: CGFloat ,
112105 item: CEWorkspaceFile ,
113106 index: Int ,
114107 draggingTabId: CEWorkspaceFile . ID ? ,
115108 onDragTabId: CEWorkspaceFile . ID ? ,
116109 closeButtonGestureActive: Binding < Bool >
117110 ) {
118- self . expectedWidth = expectedWidth
119111 self . item = item
120112 self . index = index
121113 self . draggingTabId = draggingTabId
@@ -127,10 +119,8 @@ struct EditorTabView: View {
127119 HStack ( spacing: 0.0 ) {
128120 EditorTabDivider ( )
129121 . opacity (
130- ( isActive || inHoldingState)
131- && tabBarStyle == . xcode ? 0.0 : 1.0
122+ ( isActive || inHoldingState) ? 0.0 : 1.0
132123 )
133- . padding ( . top, isActive && tabBarStyle == . native ? 1.22 : 0 )
134124 // Tab content (icon and text).
135125 HStack ( alignment: . center, spacing: 3 ) {
136126 Image ( nsImage: item. nsIcon)
@@ -150,12 +140,10 @@ struct EditorTabView: View {
150140 . lineLimit ( 1 )
151141 }
152142 . frame (
153- // To horizontally max-out the given width area ONLY in native tab bar style.
154- maxWidth: tabBarStyle == . native ? . infinity : nil ,
155143 // To max-out the parent (tab bar) area.
156144 maxHeight: . infinity
157145 )
158- . padding ( . horizontal, tabBarStyle == . native ? 28 : 20 )
146+ . padding ( . horizontal, 20 )
159147 . overlay {
160148 ZStack {
161149 // Close Button with is file changed indicator
@@ -174,36 +162,21 @@ struct EditorTabView: View {
174162 // Inactive states for tab bar item content.
175163 activeState != . inactive
176164 ? 1.0
177- : (
178- isActive
179- ? ( tabBarStyle == . xcode ? 0.6 : 0.35 )
180- : ( tabBarStyle == . xcode ? 0.4 : 0.55 )
181- )
165+ : isActive ? 0.6 : 0.4
182166 )
183167 EditorTabDivider ( )
184168 . opacity (
185- ( isActive || inHoldingState)
186- && tabBarStyle == . xcode ? 0.0 : 1.0
169+ ( isActive || inHoldingState) ? 0.0 : 1.0
187170 )
188- . padding ( . top, isActive && tabBarStyle == . native ? 1.22 : 0 )
189- }
190- . overlay ( alignment: . top) {
191- // Only show NativeTabShadow when `tabBarStyle` is native and this tab is not active.
192- EditorTabBarTopDivider ( )
193- . opacity ( tabBarStyle == . native && !isActive ? 1 : 0 )
194171 }
195172 . foregroundColor (
196173 isActive && isActiveEditor
197174 ? (
198- tabBarStyle == . xcode && colorScheme != . dark
175+ colorScheme != . dark
199176 ? Color ( nsColor: . controlAccentColor)
200177 : . primary
201178 )
202- : (
203- tabBarStyle == . xcode
204- ? . primary
205- : . secondary
206- )
179+ : . primary
207180 )
208181 . frame ( maxHeight: . infinity) // To vertically max-out the parent (tab bar) area.
209182 . contentShape ( Rectangle ( ) ) // Make entire area clickable.
@@ -225,26 +198,8 @@ struct EditorTabView: View {
225198 content
226199 }
227200 . background {
228- if tabBarStyle == . xcode {
229- EditorTabBackground ( isActive: isActive, isPressing: isPressing, isDragging: isDragging)
230- . animation ( . easeInOut( duration: 0.08 ) , value: isHovering)
231- } else {
232- if isFullscreen && isActive {
233- EditorTabBarNativeActiveMaterial ( )
234- } else {
235- EditorTabBarNativeMaterial ( )
236- }
237- ZStack {
238- // Native inactive tab background dim.
239- EditorTabBarNativeInactiveBgColor ( )
240- // Native inactive tab hover state.
241- Color ( nsColor: colorScheme == . dark ? . white : . black)
242- . opacity ( isHovering ? ( colorScheme == . dark ? 0.08 : 0.05 ) : 0.0 )
243- . animation ( . easeInOut( duration: 0.10 ) , value: isHovering)
244- }
245- . padding ( . horizontal, 1 )
246- . opacity ( isActive ? 0 : 1 )
247- }
201+ EditorTabBackground ( isActive: isActive, isPressing: isPressing, isDragging: isDragging)
202+ . animation ( . easeInOut( duration: 0.08 ) , value: isHovering)
248203 }
249204 // TODO: Enable the following code snippet when dragging-out behavior should be allowed.
250205 // Since we didn't handle the drop-outside event, dragging-out is disabled for now.
@@ -262,32 +217,20 @@ struct EditorTabView: View {
262217 }
263218 }
264219 )
265- . padding (
266- // This padding is to avoid background color overlapping with top divider.
267- . top, tabBarStyle == . xcode ? 1 : 0
268- )
220+ // This padding is to avoid background color overlapping with top divider.
221+ . padding ( . top, 1 )
269222// .offset(
270- // x: isAppeared || tabBarStyle == .native ? 0 : -14,
223+ // x: isAppeared ? 0 : -14,
271224// y: 0
272225// )
273226// .opacity(isAppeared && onDragTabId != item.id ? 1.0 : 0.0)
274227 . zIndex (
275228 isActive
276- ? ( tabBarStyle == . native ? - 1 : 2 )
229+ ? 2
277230 : ( isDragging ? 3 : ( isPressing ? 1 : 0 ) )
278231 )
279- . frame (
280- width: (
281- // Constrain the width of tab bar item for native tab style only.
282- tabBarStyle == . native
283- ? max ( expectedWidth. isFinite ? expectedWidth : 0 , 0 )
284- : nil
285- )
286- )
287232 . onAppear {
288- withAnimation (
289- . easeOut( duration: tabBarStyle == . native ? 0.15 : 0.20 )
290- ) {
233+ withAnimation ( . easeOut( duration: 0.20 ) ) {
291234// isAppeared = true
292235 }
293236 }
0 commit comments