Commit79b0f7c

authored

feat: make workspace app icons smaller, neater (#152)

1 parent6417d16 commit79b0f7cCopy full SHA for 79b0f7c

File tree

+11

-16

lines changed

+11

-16

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ enum Theme {`
`8`	`8`
`9`	`9`	`staticletrectCornerRadius:CGFloat=4`
`10`	`10`
`11`		`-staticletappIconWidth:CGFloat=30`
`12`		`-staticletappIconHeight:CGFloat=30`
	`11`	`+staticletappIconWidth:CGFloat=17`
	`12`	`+staticletappIconHeight:CGFloat=17`
`13`	`13`	`staticletappIconSize:CGSize=.init(width: appIconWidth, height: appIconHeight)`
`14`	`14`	`}`
`15`	`15`

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -180,20 +180,18 @@ struct MenuItemView: View {`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`structMenuItemCollapsibleView:View{`
`183`		`-privateletdefaultVisibleApps=5`
	`183`	`+privateletdefaultVisibleApps=6`
`184`	`184`	`letapps:[WorkspaceApp]`
`185`	`185`
`186`	`186`	`varbody:someView{`
`187`		`-HStack(spacing:17){`
	`187`	`+HStack(spacing:16){`
`188`	`188`	`ForEach(apps.prefix(defaultVisibleApps), id: \.id){ appin`
`189`	`189`	`WorkspaceAppIcon(app: app)`
`190`	`190`	`.frame(width:Theme.Size.appIconWidth, height:Theme.Size.appIconHeight)`
`191`	`191`	`}`
`192`		`-if apps.count< defaultVisibleApps{`
`193`		`-Spacer()`
`194`		`-}`
	`192`	`+Spacer()`
`195`	`193`	`}`
`196`		`-.padding(.leading,apps.count< defaultVisibleApps?14:0)`
	`194`	`+.padding(.leading,32)`
`197`	`195`	`.padding(.bottom,5)`
`198`	`196`	`.padding(.top,10)`
`199`	`197`	`}`

Lines changed: 5 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ struct WorkspaceAppIcon: View {`
`19`	`19`	`){ $0}`
`20`	`20`	`placeholder:{`
`21`	`21`	`if app.icon!=nil{`
`22`		`-ProgressView()`
	`22`	`+ProgressView().controlSize(.small)`
`23`	`23`	`}else{`
`24`		`-Text(app.displayName).frame(`
	`24`	`+Image(systemName:"questionmark").frame(`
`25`	`25`	`width:Theme.Size.appIconWidth,`
`26`	`26`	`height:Theme.Size.appIconHeight`
`27`	`27`	`)`
`@@ -30,14 +30,11 @@ struct WorkspaceAppIcon: View {`
`30`	`30`	`width:Theme.Size.appIconWidth,`
`31`	`31`	`height:Theme.Size.appIconHeight`
`32`	`32`	`)`
`33`		`-}.padding(4)`
	`33`	`+}.padding(6)`
`34`	`34`	`}`
	`35`	`+.background(isHovering?Color.accentColor.opacity(0.8):.clear)`
`35`	`36`	`.clipShape(RoundedRectangle(cornerRadius:8))`
`36`		`-.overlay(`
`37`		`-RoundedRectangle(cornerRadius:Theme.Size.rectCornerRadius*2)`
`38`		`-.stroke(.secondary, lineWidth:1)`
`39`		`-.opacity(isHovering && !isPressed?0.6:0.3)`
`40`		`-).onHover{ hoveringin isHovering= hovering}`
	`37`	`+.onHover{ hoveringin isHovering= hovering}`
`41`	`38`	`.simultaneousGesture(`
`42`	`39`	`DragGesture(minimumDistance:0)`
`43`	`40`	`.onChanged{ _in`

Comments

(0)