summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/js/js.js15
1 files changed, 14 insertions, 1 deletions
diff --git a/core/js/js.js b/core/js/js.js
index 7264198dc8c..8f16d02f96f 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1512,9 +1512,22 @@ function initCore() {
var resizeMenu = function() {
var appList = $('#appmenu li');
+ var headerWidth = $('#header-left').width() - $('#nextcloud').width()
var usePercentualAppMenuLimit = 0.33;
- var availableWidth = (($('#header-left').width() - $('#nextcloud').width()) * usePercentualAppMenuLimit);
+ var minAppsDesktop = 8;
+ var availableWidth = headerWidth - $(appList).width();
+ var isMobile = $(window).width() < 768;
+ if (!isMobile) {
+ availableWidth = headerWidth * usePercentualAppMenuLimit;
+ }
var appCount = Math.floor((availableWidth / $(appList).width()));
+ if (isMobile && appCount > minAppsDesktop) {
+ appCount = minAppsDesktop;
+ }
+ if (!isMobile && appCount < minAppsDesktop) {
+ appCount = minAppsDesktop;
+ }
+
// show at least 2 apps in the popover
if(appList.length-1-appCount >= 1) {
appCount--;