From ba5371d76bde103ea0726e5bc7f2e7690171cb9f Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 23 Nov 2024 09:56:48 +0200 Subject: [PATCH] fix(mobile): vertical layout not sized properly --- src/public/app/layouts/desktop_layout.js | 2 +- src/public/app/layouts/mobile_layout.js | 6 +++--- src/public/app/widgets/containers/root_container.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/public/app/layouts/desktop_layout.js b/src/public/app/layouts/desktop_layout.js index e3754a596..42b04d9df 100644 --- a/src/public/app/layouts/desktop_layout.js +++ b/src/public/app/layouts/desktop_layout.js @@ -96,7 +96,7 @@ export default class DesktopLayout { const launcherPaneIsHorizontal = (options.get("layoutOrientation") === "horizontal"); const launcherPane = this.#buildLauncherPane(launcherPaneIsHorizontal); - return new RootContainer() + return new RootContainer(launcherPaneIsHorizontal) .setParent(appContext) .optChild(launcherPaneIsHorizontal, new FlexContainer('row') .child(new TabRowWidget().class("full-width")) diff --git a/src/public/app/layouts/mobile_layout.js b/src/public/app/layouts/mobile_layout.js index 2d6b40cc6..397308137 100644 --- a/src/public/app/layouts/mobile_layout.js +++ b/src/public/app/layouts/mobile_layout.js @@ -115,7 +115,7 @@ export default class MobileLayout { getRootWidget(appContext) { const launcherPaneIsHorizontal = (options.get("layoutOrientation") === "horizontal"); - return new RootContainer() + return new RootContainer(launcherPaneIsHorizontal) .setParent(appContext) .cssBlock(MOBILE_CSS) .child(this.#buildLauncherPane(launcherPaneIsHorizontal)) @@ -178,13 +178,13 @@ export default class MobileLayout { let launcherPane; if (isHorizontal) { - launcherPane = new FlexContainer(isHorizontal ? "row" : "column") + launcherPane = new FlexContainer("row") .class("horizontal") .css("height", "53px") .child(new LauncherContainer(true)) .child(new GlobalMenuWidget(true)); } else { - launcherPane = new FlexContainer(launcherPaneIsHorizontal ? "row" : "column") + launcherPane = new FlexContainer("column") .class("vertical") .css("width", "53px") .child(new GlobalMenuWidget(false)) diff --git a/src/public/app/widgets/containers/root_container.js b/src/public/app/widgets/containers/root_container.js index e6a4a4a7a..23dcf1ac2 100644 --- a/src/public/app/widgets/containers/root_container.js +++ b/src/public/app/widgets/containers/root_container.js @@ -1,8 +1,8 @@ import FlexContainer from "./flex_container.js"; export default class RootContainer extends FlexContainer { - constructor() { - super('column'); + constructor(isHorizontalLayout) { + super(isHorizontalLayout ? "column" : "row"); this.id('root-widget'); this.css('height', '100%');