no-bug: Make extensions list hidden for double toolbar (gh-13610)

package.json

@@ -27,7 +27,7 @@
     "surfer": "surfer",
     "test": "python3 scripts/run_tests.py",
     "test:dbg": "python3 scripts/run_tests.py --jsdebugger --debug-on-failure",
-    "ffprefs": "${CARGO:-cargo} run --manifest-path tools/ffprefs/Cargo.toml --bin ffprefs -- prefs engine",
+    "ffprefs": "cd tools/ffprefs && cargo run --bin ffprefs -- ../../",
     "lc": "surfer license-check",
     "lc:fix": "surfer license-check --fix",
     "use-moz-src": "cd engine && ./mach use-moz-src",

scripts/update_service_dumps.py

@@ -60,7 +60,4 @@ def main():
 
 
 if __name__ == "__main__":
-  import sys
-  if len(sys.argv) == 3:
-    _, DUMPS_FOLDER, ENGINE_DUMPS_FOLDER = sys.argv
   main()

src/zen/common/styles/zen-overflowing-addons.css

@@ -4,48 +4,52 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#zen-overflow-extensions-list:not(:empty) {
-  --uei-icon-size: 14px;
-  display: grid;
-  gap: 8px;
-  padding: 8px 2px;
-  padding-bottom: 0;
-  border-radius: calc(var(--border-radius-medium) - 4px);
-  grid-template-columns: repeat(auto-fit, minmax(32px, 1fr));
+#zen-overflow-extensions-list {
+  display: none;
+  
+  :root[zen-single-toolbar="true"] &:not(:empty) {
+    --uei-icon-size: 14px;
+    display: grid;
+    gap: 8px;
+    padding: 8px 2px;
+    padding-bottom: 0;
+    border-radius: calc(var(--border-radius-medium) - 4px);
+    grid-template-columns: repeat(auto-fit, minmax(32px, 1fr));
 
-  & .unified-extensions-item {
-    flex: 1;
-    margin: 0;
-  }
+    & .unified-extensions-item {
+      flex: 1;
+      margin: 0;
+    }
 
-  & .toolbarbutton-badge-stack {
-    margin: 0;
-    width: 100%;
-    height: 100%;
-    padding: 8px 0;
-    justify-content: center;
-    align-items: center;
-  }
+    & .toolbarbutton-badge-stack {
+      margin: 0;
+      width: 100%;
+      height: 100%;
+      padding: 8px 0;
+      justify-content: center;
+      align-items: center;
+    }
 
-  & .unified-extensions-item-action-button {
-    appearance: none;
-    background-color: var(--zen-toolbar-element-bg);
-    height: 30px;
-    margin: 0;
-    justify-content: center;
-    align-items: center;
-    border-radius: var(--border-radius-medium);
-    overflow: clip;
-    padding: 0;
+    & .unified-extensions-item-action-button {
+      appearance: none;
+      background-color: var(--zen-toolbar-element-bg);
+      height: 30px;
+      margin: 0;
+      justify-content: center;
+      align-items: center;
+      border-radius: var(--border-radius-medium);
+      overflow: clip;
+      padding: 0;
 
-    &:hover {
-      background-color: var(--zen-toolbar-element-bg-hover);
+      &:hover {
+        background-color: var(--zen-toolbar-element-bg-hover);
+      }
+    }
+
+    .unified-extensions-item-contents,
+    .unified-extensions-item-menu-button,
+    unified-extensions-item-messagebar-wrapper {
+      display: none;
     }
   }
-
-  .unified-extensions-item-contents,
-  .unified-extensions-item-menu-button,
-  unified-extensions-item-messagebar-wrapper {
-    display: none;
-  }
-}
+}

tools/ffprefs/src/main.rs

@@ -107,9 +107,9 @@ use std::env;
 use std::fs;
 use std::path::PathBuf;
 
-const STATIC_PREFS: &str = "modules/libpref/init/zen-static-prefs.inc";
-const FIREFOX_PREFS: &str = "browser/app/profile/firefox.js";
-const DYNAMIC_PREFS: &str = "browser/app/profile/zen.js";
+const STATIC_PREFS: &str = "../engine/modules/libpref/init/zen-static-prefs.inc";
+const FIREFOX_PREFS: &str = "../engine/browser/app/profile/firefox.js";
+const DYNAMIC_PREFS: &str = "../engine/browser/app/profile/zen.js";
 
 #[derive(Serialize, Deserialize, PartialEq, Debug)]
 struct Preference {
@@ -124,6 +124,12 @@ struct Preference {
     sticky: Option<bool>,
 }
 
+fn get_config_path() -> PathBuf {
+    let mut path = env::current_dir().expect("Failed to get current directory");
+    path.push("prefs");
+    path
+}
+
 fn ordered_prefs(mut prefs: Vec<Preference>) -> Vec<Preference> {
     // Sort preferences by name
     prefs.sort_by(|a, b| a.name.cmp(&b.name));
@@ -147,10 +153,11 @@ fn get_prefs_files_recursively(dir: &PathBuf, files: &mut Vec<PathBuf>) {
     }
 }
 
-fn load_preferences(prefs_path: &PathBuf) -> Vec<Preference> {
+fn load_preferences() -> Vec<Preference> {
     let mut prefs = Vec::new();
+    let config_path = get_config_path();
     let mut pref_files = Vec::new();
-    get_prefs_files_recursively(&prefs_path, &mut pref_files);
+    get_prefs_files_recursively(&config_path, &mut pref_files);
     for file_path in pref_files {
         let content = fs::read_to_string(&file_path).expect("Failed to read file");
         let mut parsed_prefs: Vec<Preference> =
@@ -256,9 +263,14 @@ fn get_value(pref: &Preference) -> String {
     }
 }
 
-fn write_preferences(engine_path: &PathBuf, prefs: &[Preference]) {
-    let static_prefs_path = engine_path.join(STATIC_PREFS);
-    let dynamic_prefs_path = engine_path.join(DYNAMIC_PREFS);
+fn write_preferences(prefs: &[Preference]) {
+    let config_path = get_config_path();
+    if !config_path.exists() {
+        fs::create_dir_all(&config_path).expect("Failed to create prefs directory");
+    }
+
+    let static_prefs_path = config_path.join(STATIC_PREFS);
+    let dynamic_prefs_path = config_path.join(DYNAMIC_PREFS);
     println!(
         "Writing preferences to:\n  Static: {}\n  Dynamic: {}",
         static_prefs_path.display(),
@@ -288,10 +300,10 @@ fn write_preferences(engine_path: &PathBuf, prefs: &[Preference]) {
     fs::write(&dynamic_prefs_path, dynamic_content).expect("Failed to write dynamic prefs");
 }
 
-fn prepare_zen_prefs(engine_path: &PathBuf) {
+fn prepare_zen_prefs() {
     // Add `#include zen.js` to the bottom of the firefox.js file if it doesn't exist
     let line = "#include zen.js";
-    let firefox_prefs_path = engine_path.join(FIREFOX_PREFS);
+    let firefox_prefs_path = get_config_path().join(FIREFOX_PREFS);
     if let Ok(mut content) = fs::read_to_string(&firefox_prefs_path) {
         if !content.contains(line) {
             content.push_str(format!("\n{}\n", line).as_str());
@@ -339,19 +351,15 @@ fn expand_pref_values(prefs: &mut [Preference]) {
 
 fn main() {
     let args: Vec<String> = env::args().collect();
-    let prefs_path = if args.len() > 1 {
+    let root_path = if args.len() > 1 {
         PathBuf::from(&args[1])
     } else {
-        PathBuf::from("prefs")
-    };
-    let engine_path = if args.len() > 2 {
-        PathBuf::from(&args[2])
-    } else {
-        PathBuf::from("engine")
+        env::current_dir().expect("Failed to get current directory")
     };
+    env::set_current_dir(&root_path).expect("Failed to change directory");
 
-    prepare_zen_prefs(&engine_path);
-    let mut preferences = load_preferences(&prefs_path);
+    prepare_zen_prefs();
+    let mut preferences = load_preferences();
     expand_pref_values(&mut preferences);
-    write_preferences(&engine_path, &preferences);
+    write_preferences(&preferences);
 }