From d33162785e15d73977b7942555fdcf6717597ca2 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Mon, 7 Apr 2025 17:55:35 +0300
Subject: [PATCH] fix(client): right-shift on non-standard themes (closes
 #1646)

---
 .../widgets/containers/launcher_container.ts    | 13 -------------
 src/public/stylesheets/theme-next/shell.css     | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/public/app/widgets/containers/launcher_container.ts b/src/public/app/widgets/containers/launcher_container.ts
index 87d25250e..5a814d1fa 100644
--- a/src/public/app/widgets/containers/launcher_container.ts
+++ b/src/public/app/widgets/containers/launcher_container.ts
@@ -11,19 +11,6 @@ export default class LauncherContainer extends FlexContainer<LauncherWidget> {
         super(isHorizontalLayout ? "row" : "column");
 
         this.id("launcher-container");
-
-        if (isHorizontalLayout) {
-            this.css("width", "100%");
-            this.css("height", "100%");
-            this.css("overflow-x", "auto");
-            this.css("overflow-y", "hidden");
-        } else {
-            this.css("height", "100%");
-            this.css("overflow-x", "hidden");
-            this.css("overflow-y", "auto");
-        }
-
-        this.css("scrollbar-gutter", "stable both-edges");
         this.filling();
         this.isHorizontalLayout = isHorizontalLayout;
 
diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css
index 5552e482d..dc0746b4c 100644
--- a/src/public/stylesheets/theme-next/shell.css
+++ b/src/public/stylesheets/theme-next/shell.css
@@ -108,6 +108,10 @@ body.layout-horizontal > .horizontal {
     align-items: center;
 }
 
+#launcher-container {
+    scrollbar-gutter: stable both-edges;
+}
+
 #launcher-pane.vertical {
     --launcher-pane-border-color: unset;
     --launcher-pane-background-color: var(--launcher-pane-vert-background-color);
@@ -126,6 +130,12 @@ body.layout-horizontal > .horizontal {
     padding-bottom: var(--launcher-pane-button-gap);
 }
 
+#launcher-pane.vertical #launcher-container {
+    height: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+}
+
 #launcher-pane.horizontal {
     --launcher-pane-border-color: var(--launcher-pane-horiz-border-color);
     --launcher-pane-background-color: var(--launcher-pane-horiz-background-color);
@@ -144,6 +154,13 @@ body.layout-horizontal > .horizontal {
     align-items: center;
 }
 
+#launcher-pane.horizontal #launcher-container {
+    width: 100%;
+    height: 100%;
+    overflow-x: auto;
+    overflow-y: hidden;
+}
+
 @media (max-width: 991px) {
     #mobile-bottom-bar {
         background: var(--launcher-pane-horiz-background-color);