Merge branch 'feature/super-modern-subtitle-settings-panel' into feat…

…ure/improve-mobile-layout
bitmovin · Dec 11, 2024 · 66b3186 · 66b3186
2 parents cdef5a4 + 86ff8c6
commit 66b3186
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/scss/skin-super-modern/components/_settingspanelitem.scss b/src/scss/skin-super-modern/components/_settingspanelitem.scss
@@ -1,6 +1,7 @@
 @import '../variables';
 
 %ui-settings-panel-item {
+  line-height: 1.5em;
   padding: .5em .7em;
   white-space: nowrap;
 

diff --git a/src/ts/components/settingspanel.ts b/src/ts/components/settingspanel.ts
@@ -217,12 +217,18 @@ export class SettingsPanel extends Container<SettingsPanelConfig> {
       targetPage = this.getRootPage();
     }
 
+    const currentActivePage = this.activePage;
     this.navigateToPage(
       targetPage,
       this.activePage,
       NavigationDirection.Backwards,
       !(this.config as SettingsPanelConfig).pageTransitionAnimation,
     );
+
+    if (currentActivePage.getConfig().removeOnPop) {
+      this.removeComponent(currentActivePage);
+      this.updateComponents();
+    }
   }
 
   /**