From 3f68170a49443b666a7a8642823e45f36b4b2614 Mon Sep 17 00:00:00 2001
From: smc <128479338+crazysmc@users.noreply.github.com>
Date: Sat, 4 Oct 2025 15:26:42 +0200
Subject: [PATCH] Enable browser integration settings on all platforms (#6509)

* Enable browser integration settings on all platforms

* nit: document /watching for Windows too

* nit: only show "attach" setting on Windows

* chore: add changelog entry

* another changelog update

---------

Co-authored-by: smc <crazysmc@users.noreply.github.com>
Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
---
 CHANGELOG.md                              |  1 +
 src/widgets/settingspages/GeneralPage.cpp | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3f0f96e..46420aeb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Minor: Fixed usercard resizing improperly without recent messages. (#6496)
 - Minor: Added setting for character limit of deleted messages. (#6491)
 - Minor: Added link support to plugin message API. (#6386)
+- Bugfix: Expose the "Extra extension IDs" setting on non-Windows systems too. (#6509)
 - Dev: Update release documentation. (#6498)
 - Dev: Make code sanitizers opt in with the `CHATTERINO_SANITIZER_SUPPORT` CMake option. After that's enabled, use the `SANITIZE_*` flag to enable individual sanitizers. (#6493)
 - Dev: Remove unused QTextCodec includes. (#6487)
diff --git a/src/widgets/settingspages/GeneralPage.cpp b/src/widgets/settingspages/GeneralPage.cpp
index 7778b946..73fa5907 100644
--- a/src/widgets/settingspages/GeneralPage.cpp
+++ b/src/widgets/settingspages/GeneralPage.cpp
@@ -889,10 +889,16 @@ void GeneralPage::initLayout(GeneralPageView &layout)
             "issues <a href='https://chatterino.com/link/issues'>here</a>.");
     }
 
-#ifdef Q_OS_WIN
     layout.addTitle("Browser Integration");
-    layout.addDescription("The browser extension replaces the default "
-                          "Twitch.tv chat with Chatterino.");
+#ifdef Q_OS_WIN
+    layout.addDescription(
+        "The browser extension replaces the default "
+        "Twitch.tv chat with Chatterino, and updates the /watching split on "
+        "Chatterino when Twitch.tv is open.");
+#else
+    layout.addDescription("The browser extension updates the /watching "
+                          "split on Chatterino when Twitch.tv is open.");
+#endif
 
     {
         if (auto err = nmIpcError().get())
@@ -910,6 +916,7 @@ void GeneralPage::initLayout(GeneralPageView &layout)
     layout.addDescription(
         formatRichNamedLink(FIREFOX_EXTENSION_LINK, "Download for Firefox"));
 
+#ifdef Q_OS_WIN
     layout.addDescription("Chatterino only attaches to known browsers to avoid "
                           "attaching to other windows by accident.");
     SettingWidget::checkbox("Attach to any browser (may cause issues)",
@@ -918,6 +925,7 @@ void GeneralPage::initLayout(GeneralPageView &layout)
             "Attempt to force the Chatterino Browser Extension to work in "
             "certain browsers that do not work automatically.\ne.g. Librewolf")
         ->addTo(layout);
+#endif
 
     {
         auto *note = layout.addDescription(
@@ -938,7 +946,6 @@ void GeneralPage::initLayout(GeneralPageView &layout)
                                 "Extension;IDs;separated;by;semicolons")
             ->addTo(layout, form);
     }
-#endif
 
     layout.addTitle("AppData & Cache");