From 37667df8802818ebeee3875af3dc39f3190248a0 Mon Sep 17 00:00:00 2001
From: hadi <hnategh@gmail.com>
Date: Tue, 19 Dec 2023 13:22:06 +0100
Subject: [PATCH] Fix wrongly filtered avatars in darkmode, happens for
 calOwner and regular account-selector widgets

---
 api/js/etemplate/Et2Select/Select/Et2SelectAccount.ts | 2 +-
 calendar/js/CalendarOwner.ts                          | 4 ++--
 pixelegg/css/mobile.css                               | 1 -
 pixelegg/css/monochrome.css                           | 3 +--
 pixelegg/css/pixelegg.css                             | 1 -
 pixelegg/less/darkmode.less                           | 2 +-
 pixelegg/mobile/fw_mobile.css                         | 2 +-
 7 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/api/js/etemplate/Et2Select/Select/Et2SelectAccount.ts b/api/js/etemplate/Et2Select/Select/Et2SelectAccount.ts
index ecb4582e51..121c91c585 100644
--- a/api/js/etemplate/Et2Select/Select/Et2SelectAccount.ts
+++ b/api/js/etemplate/Et2Select/Select/Et2SelectAccount.ts
@@ -146,7 +146,7 @@ export class Et2SelectAccount extends SelectAccountMixin(Et2StaticSelectMixin(Et
 		let style = getComputedStyle(this);
 
 		return html`
-            <et2-lavatar slot="prefix" part="icon" .size=${style.getPropertyValue("--icon-width")}
+            <et2-lavatar slot="prefix" part="icon" exportparts="image" .size=${style.getPropertyValue("--icon-width")}
                          lname=${option.lname || nothing}
                          fname=${option.fname || nothing}
                          image=${option.icon || nothing}
diff --git a/calendar/js/CalendarOwner.ts b/calendar/js/CalendarOwner.ts
index fa3c252876..288e2aaccd 100644
--- a/calendar/js/CalendarOwner.ts
+++ b/calendar/js/CalendarOwner.ts
@@ -73,7 +73,7 @@ export class CalendarOwner extends Et2StaticSelectMixin(Et2Select)
 		return html`
             <sl-option
                     part="option"
-                    exportparts="prefix:tag__prefix, suffix:tag__suffix"
+                    exportparts="prefix:tag__prefix, suffix:tag__suffix, image"
                     value="${value}"
                     title="${!option.title || this.noLang ? option.title : this.egw().lang(option.title)}"
                     class=${classMap({
@@ -183,7 +183,7 @@ export class CalendarOwner extends Et2StaticSelectMixin(Et2Select)
 		// lavatar uses a size property, not a CSS variable
 		let style = getComputedStyle(this);
 		return html`
-            <et2-lavatar slot="prefix" part="icon" .size=${style.getPropertyValue("--icon-width")}
+            <et2-lavatar slot="prefix" part="icon" exportparts="image" .size=${style.getPropertyValue("--icon-width")}
                          lname=${option.lname || nothing}
                          fname=${option.fname || nothing}
                          image=${option.icon || nothing}
diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 7b579f6f0f..9dde46729b 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -84,7 +84,6 @@
   html[data-darkmode='1'] #blueimp-gallery ol,
   html[data-darkmode='1'] et2-select-account::part(icon),
   html[data-darkmode='1'] et2-select-email::part(icon),
-  html[data-darkmode='1'] et2-calendar-owner::part(icon),
   html[data-darkmode='1'] sl-menu-item [slot="prefix"],
   html[data-darkmode='1'] iframe,
   html[data-darkmode='1'] et2-lavatar[image=""]::part(base),
diff --git a/pixelegg/css/monochrome.css b/pixelegg/css/monochrome.css
index 32bebbd95a..7d86c74370 100644
--- a/pixelegg/css/monochrome.css
+++ b/pixelegg/css/monochrome.css
@@ -64,7 +64,6 @@
   html[data-darkmode='1'] #blueimp-gallery ol,
   html[data-darkmode='1'] et2-select-account::part(icon),
   html[data-darkmode='1'] et2-select-email::part(icon),
-  html[data-darkmode='1'] et2-calendar-owner::part(icon),
   html[data-darkmode='1'] sl-menu-item [slot="prefix"],
   html[data-darkmode='1'] iframe,
   html[data-darkmode='1'] et2-lavatar[image=""]::part(base),
@@ -6590,4 +6589,4 @@ span.egw_tutorial_title {
 /*@import "../less/layout_raster.less";*/
 /*@import "../less/layout_nextmatch.less";*/
 /*@import "../less/layout_footer.less";*/
-/*@import "../less/layout_dialog.less";*/
\ No newline at end of file
+/*@import "../less/layout_dialog.less";*/
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 94e81b8c3d..b8d045bb54 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -74,7 +74,6 @@
   html[data-darkmode='1'] #blueimp-gallery ol,
   html[data-darkmode='1'] et2-select-account::part(icon),
   html[data-darkmode='1'] et2-select-email::part(icon),
-  html[data-darkmode='1'] et2-calendar-owner::part(icon),
   html[data-darkmode='1'] sl-menu-item [slot="prefix"],
   html[data-darkmode='1'] iframe,
   html[data-darkmode='1'] et2-lavatar[image=""]::part(base),
diff --git a/pixelegg/less/darkmode.less b/pixelegg/less/darkmode.less
index c350f68ac3..f779bd741f 100644
--- a/pixelegg/less/darkmode.less
+++ b/pixelegg/less/darkmode.less
@@ -32,7 +32,7 @@
 
 	sl-menu-item::part(prefix), et2-select-country::part(prefix),
 	et2-button::part(prefix), *::part(image), img, #blueimp-gallery:not(:fullscreen), #blueimp-gallery ol,
-	 et2-select-account::part(icon), et2-select-email::part(icon), et2-calendar-owner::part(icon),	sl-menu-item [slot="prefix"],
+	 et2-select-account::part(icon), et2-select-email::part(icon), sl-menu-item [slot="prefix"],
 	iframe, et2-lavatar[image=""]::part(base), et2-avatar[id="_cropper_image"],
 	video, #loginMainDiv, .et2_taglist_tags_icon, .fw_avatar_stat, et2-avatar-group,
 	.blueimp-gallery .slide {
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index 05cfb58b58..64196af06f 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -49,7 +49,6 @@
   html[data-darkmode='1'] #blueimp-gallery ol,
   html[data-darkmode='1'] et2-select-account::part(icon),
   html[data-darkmode='1'] et2-select-email::part(icon),
-  html[data-darkmode='1'] et2-calendar-owner::part(icon),
   html[data-darkmode='1'] sl-menu-item [slot="prefix"],
   html[data-darkmode='1'] iframe,
   html[data-darkmode='1'] et2-lavatar[image=""]::part(base),
@@ -9501,3 +9500,4 @@ table.egwGridView_grid img.et2_appicon {
     border-radius: 0;
   }
 }
+/*# sourceMappingURL=fw_mobile.css.map */
\ No newline at end of file