From 49979c858b7a9788ea6b66b689f8fa51bc0847ca Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon.vieille@trinaps.com>
Date: Fri, 23 Jun 2023 15:37:03 +0200
Subject: [PATCH 1/2] fix top position of always opened menu

fix dashboard menu when using always opened menu
---
 css/sideMenu.css | 11 ++++++++++-
 src/SideMenu.vue | 10 +++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/css/sideMenu.css b/css/sideMenu.css
index 7224803..7fc71a2 100644
--- a/css/sideMenu.css
+++ b/css/sideMenu.css
@@ -239,14 +239,23 @@
   left: 50px;
 }
 
+.side-menu-always-displayed #header {
+  position: absolute !important;
+}
+
 .side-menu-always-displayed #side-menu {
   display: block;
 }
 
 .side-menu-always-displayed .side-menu-apps-list {
+  height: 100vh;
+  top: 0;
+  overflow: hidden;
+}
+
+.side-menu-always-displayed .side-menu-apps-list--with-settings {
   height: calc(100vh - 49px);
   top: 49px;
-  overflow: hidden;
 }
 
 .side-menu-always-displayed .side-menu-apps-list:hover {
diff --git a/src/SideMenu.vue b/src/SideMenu.vue
index fd2f24e..de7065d 100644
--- a/src/SideMenu.vue
+++ b/src/SideMenu.vue
@@ -16,7 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 <template>
   <div id="side-menu">
-    <div class="side-menu-header">
+    <div class="side-menu-header" v-if="settings || !openerHover || (!avatar && !alwaysDisplayed && logo) || avatar">
       <SettingsButton
         v-if="settings"
         v-bind:href="settings.href"
@@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
       <OpenerButton />
 
       <Logo
-        v-if="!avatar && logo" v-bind:classes="{'side-menu-logo': true, 'avatardiv': false}"
+        v-if="!avatar && !alwaysDisplayed && logo" v-bind:classes="{'side-menu-logo': true, 'avatardiv': false}"
         v-bind:image="logo"
         v-bind:link="logoLink"
       />
@@ -38,7 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
       />
     </div>
 
-    <ul class="side-menu-apps-list">
+    <ul class="side-menu-apps-list" :class="{'side-menu-apps-list--with-settings': !!settings}">
       <SideMenuApp
         v-for="(app, key) in apps"
         v-if="!hiddenApps.includes(app.id)"
@@ -79,6 +79,8 @@ export default {
       targetBlankApps: [],
       hiddenApps: [],
       settings: null,
+      openerHover: false,
+      alwaysDisplayed: false,
     }
   },
   methods: {
@@ -136,6 +138,8 @@ export default {
         this.logo = config['logo']
         this.logoLink = config['logo-link']
         this.settings = config['settings']
+        this.openerHover = config['opener-hover']
+        this.alwaysDisplayed = config['always-displayed']
         this.hiddenApps = config['big-menu-hidden-apps']
         this.retrieveApps()
       })

From 0ea5a579a6db07caa3c189fd40f1b54c27889568 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon.vieille@trinaps.com>
Date: Thu, 29 Jun 2023 12:54:49 +0200
Subject: [PATCH 2/2] release v3.9.1

---
 CHANGELOG.md     | 4 ++++
 appinfo/info.xml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24c2f30..d59a7d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## 3.9.1
+### Fixed
+* fix fixed menu on dashboard (#262)
+
 ## 3.9.0
 ### Added
 * add compatibility with NC27
diff --git a/appinfo/info.xml b/appinfo/info.xml
index e072e22..4acf6f4 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -32,7 +32,7 @@ Notice
 Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
 In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
 ]]></description>
-    <version>3.9.0</version>
+    <version>3.9.1</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>