From 77bac52b072ee4b170d1f415dbbb1ff027a8466b Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Tue, 13 May 2025 00:23:33 +0200
Subject: [PATCH] fix: Completed windows API, b=(no-bug), c=no-component

---
 src/zen/common/styles/zen-popup.css           |  4 +++
 .../common/windows/ZenShareInternal.cpp       | 28 +++++++++++++------
 src/zen/toolkit/common/windows/moz.build      |  2 ++
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/zen/common/styles/zen-popup.css b/src/zen/common/styles/zen-popup.css
index b8ff75ad6..40c101d9d 100644
--- a/src/zen/common/styles/zen-popup.css
+++ b/src/zen/common/styles/zen-popup.css
@@ -366,6 +366,9 @@ menuitem {
     gap: 10px;
     z-index: 1000;
     padding: 10px;
+    @media (-moz-platform: windows) {
+      padding: 6px;
+    }
     border-radius: 12px;
     background: linear-gradient(
       170deg,
@@ -398,6 +401,7 @@ menuitem {
       padding: 0 12px !important;
       min-width: unset !important;
       margin: 0px !important;
+      border-radius: 8px !important;
     }
   }
 }
diff --git a/src/zen/toolkit/common/windows/ZenShareInternal.cpp b/src/zen/toolkit/common/windows/ZenShareInternal.cpp
index d2f585c97..55ca10aef 100644
--- a/src/zen/toolkit/common/windows/ZenShareInternal.cpp
+++ b/src/zen/toolkit/common/windows/ZenShareInternal.cpp
@@ -3,12 +3,24 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ZenShareInternal.h"
-#include "nsIWindowsUIUtils.h"
+#include "WindowsUIUtils.h"
 
-auto nsZenNativeShareInternal::ShowNativeDialog(
-      nsCOMPtr<mozIDOMWindowProxy>& aWindow, nsIURI* aUrl,
-      const nsACString& aTitle, const nsACString& aText,
-      uint32_t aX, uint32_t aY) const
+namespace zen {
+/**
+* @brief Helper function to convert UTF-8 to UTF-16.
+* @param aStr The UTF-8 string to convert.
+* @returns The converted UTF-16 string.
+*/
+inline NS_ConvertUTF8toUTF16 NS_ConvertUTF8toUTF16_MaybeVoid(
+    const nsACString& aStr) {
+  auto str = NS_ConvertUTF8toUTF16(aStr);
+  str.SetIsVoid(aStr.IsVoid());
+  return str;
+}
+} // namespace: zen
+
+auto nsZenNativeShareInternal::ShowNativeDialog(nsCOMPtr<mozIDOMWindowProxy>& aWindow, nsIURI* aUrl,
+      const nsACString& aTitle, const nsACString& aText, uint32_t aX, uint32_t aY) 
     -> nsresult {
   nsAutoCString urlString;
   if (aUrl) {
@@ -18,8 +30,8 @@ auto nsZenNativeShareInternal::ShowNativeDialog(
   } else {
     urlString.SetIsVoid(true);
   }
-  (void)WindowsUIUtils::Share(NS_ConvertUTF8toUTF16_MaybeVoid(aTitle),
-                              NS_ConvertUTF8toUTF16_MaybeVoid(aText),
-                              NS_ConvertUTF8toUTF16_MaybeVoid(urlString));
+  (void)WindowsUIUtils::Share(zen::NS_ConvertUTF8toUTF16_MaybeVoid(aTitle),
+                              zen::NS_ConvertUTF8toUTF16_MaybeVoid(aText),
+                              zen::NS_ConvertUTF8toUTF16_MaybeVoid(urlString));
   return NS_OK;
 }
diff --git a/src/zen/toolkit/common/windows/moz.build b/src/zen/toolkit/common/windows/moz.build
index f2ef0a8a7..385d37232 100644
--- a/src/zen/toolkit/common/windows/moz.build
+++ b/src/zen/toolkit/common/windows/moz.build
@@ -6,4 +6,6 @@ SOURCES += [
 
 LOCAL_INCLUDES += [
     "../",
+    "/widget",
+    "/widget/windows",
 ]