Show mail folder icons in label view

Close #7760 Co-authored-by: ivk <ivk@tutao.de>
tutao · Nov 20, 2024 · 714ede9 · 714ede9
1 parent 2113713
commit 714ede9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/common/api/common/TutanotaConstants.ts b/src/common/api/common/TutanotaConstants.ts
@@ -105,6 +105,10 @@ export enum MailSetKind {
 	LABEL = "8",
 }
 
+export function getMailSetKind(folder: MailFolder): MailSetKind {
+	return folder.folderType as MailSetKind
+}
+
 export const enum ReplyType {
 	NONE = "0",
 	REPLY = "1",

diff --git a/src/common/gui/main-styles.ts b/src/common/gui/main-styles.ts
@@ -1623,9 +1623,9 @@ styles.registerStyle("main", () => {
 			"line-height": px(18),
 		},
 		".list-font-icons": {
-			"letter-spacing": "8px",
+			"letter-spacing": "1px",
 			"text-align": "right",
-			"margin-right": "-8px",
+			"margin-right": "-3px",
 		},
 		".monospace": {
 			"font-family": '"Lucida Console", Monaco, monospace',

diff --git a/src/mail-app/mail/view/MailListView.ts b/src/mail-app/mail/view/MailListView.ts
@@ -76,7 +76,7 @@ export class MailListView implements Component<MailListViewAttrs> {
 		multiselectionAllowed: MultiselectMode.Enabled,
 		createElement: (dom: HTMLElement) => {
 			const mailRow = new MailRow(
-				false,
+				this.mailViewModel.getSelectedMailSetKind() === MailSetKind.LABEL,
 				(mail) => this.mailViewModel.getLabelsForMail(mail),
 				(entity) => this.attrs.onSingleExclusiveSelection(entity),
 			)

diff --git a/src/mail-app/mail/view/MailViewModel.ts b/src/mail-app/mail/view/MailViewModel.ts
@@ -33,7 +33,7 @@ import { ListState } from "../../../common/gui/base/List.js"
 import { ConversationPrefProvider, ConversationViewModel, ConversationViewModelFactory } from "./ConversationViewModel.js"
 import { CreateMailViewerOptions } from "./MailViewer.js"
 import { isOfflineError } from "../../../common/api/common/utils/ErrorUtils.js"
-import { MailSetKind, OperationType } from "../../../common/api/common/TutanotaConstants.js"
+import { getMailSetKind, MailSetKind, OperationType } from "../../../common/api/common/TutanotaConstants.js"
 import { WsConnectionState } from "../../../common/api/main/WorkerClient.js"
 import { WebsocketConnectivityModel } from "../../../common/misc/WebsocketConnectivityModel.js"
 import { ExposedCacheStorage } from "../../../common/api/worker/rest/DefaultEntityRestCache.js"
@@ -113,6 +113,10 @@ export class MailViewModel {
 		private readonly updateUi: () => unknown,
 	) {}
 
+	getSelectedMailSetKind(): MailSetKind | null {
+		return this._folder ? getMailSetKind(this._folder) : null
+	}
+
 	/** Map from element id of MailSetEntry to an entry itself. Needed to react to entity updates. Reset on folder change. */
 	private mailSetEntries: () => Map<Id, MailSetEntry> = memoizedWithHiddenArgument(
 		() => this._folder?._id?.[1],