Merge pull request #2775 from CommandPost/issue/2774-ui-height-tweaks

Restrict UI height to screen height and show scrollbars if bigger

src/plugins/core/controlsurfaces/manager/css/preferences.css

@@ -2,7 +2,8 @@ body {
  background-color: #1f1f1f;
  font-family: -apple-system;
  font-size: 13px;
- overflow:hidden;
+ max-width: 100%;
+ overflow-x: hidden;
  color: #999999;
 }
 

src/plugins/core/controlsurfaces/manager/init.lua

@@ -8,6 +8,7 @@ local hs = _G.hs
 local log = require "hs.logger".new "prefsMgr"
 
 local inspect = require "hs.inspect"
+local mouse = require "hs.mouse"
 local screen = require "hs.screen"
 local timer = require "hs.timer"
 local toolbar = require "hs.webview.toolbar"
@@ -525,7 +526,20 @@ function mod.selectPanel(id)
  offset = -20
  end
 
- mod._webview:size({w = mod.DEFAULT_WIDTH, h = height + offset})
+ --------------------------------------------------------------------------------
+ -- Make sure the panel isn't bigger than the screen:
+ --------------------------------------------------------------------------------
+ local heightWithOffset = height + offset
+
+ local currentScreen = mouse.getCurrentScreen()
+ local currentFrame = currentScreen and currentScreen:frame()
+ local currentHeight = currentFrame and currentFrame.h
+
+ if heightWithOffset > currentHeight then
+ heightWithOffset = currentHeight - 10
+ end
+
+ mod._webview:size({w = mod.DEFAULT_WIDTH, h = heightWithOffset})
  end
 
  end

src/plugins/core/preferences/manager/css/preferences.css

@@ -2,7 +2,8 @@ body {
  background-color: #1f1f1f;
  font-family: -apple-system;
  font-size: 13px;
- overflow:hidden;
+ max-width: 100%;
+ overflow-x: hidden;
  color: #999999;
 }
 

src/plugins/core/preferences/manager/init.lua

@@ -8,6 +8,7 @@ local hs = _G.hs
 local log = require "hs.logger".new "prefsMgr"
 
 local inspect = require "hs.inspect"
+local mouse = require "hs.mouse"
 local screen = require "hs.screen"
 local timer = require "hs.timer"
 local toolbar = require "hs.webview.toolbar"
@@ -515,7 +516,20 @@ function mod.selectPanel(id)
  offset = -20
  end
 
- mod._webview:size({w = mod.DEFAULT_WIDTH, h = height + offset})
+ --------------------------------------------------------------------------------
+ -- Make sure the panel isn't bigger than the screen:
+ --------------------------------------------------------------------------------
+ local heightWithOffset = height + offset
+
+ local currentScreen = mouse.getCurrentScreen()
+ local currentFrame = currentScreen and currentScreen:frame()
+ local currentHeight = currentFrame and currentFrame.h
+
+ if heightWithOffset > currentHeight then
+ heightWithOffset = currentHeight - 10
+ end
+
+ mod._webview:size({w = mod.DEFAULT_WIDTH, h = heightWithOffset})
  end
 
  end

src/plugins/core/toolbox/manager/css/preferences.css

@@ -2,7 +2,8 @@ body {
  background-color: #1f1f1f;
  font-family: -apple-system;
  font-size: 13px;
- overflow:hidden;
+ max-width: 100%;
+ overflow-x: hidden;
  color: #999999;
 }
 

src/plugins/core/toolbox/manager/init.lua

@@ -9,6 +9,7 @@ local hs = _G.hs
 local log = require "hs.logger".new "utils"
 
 local inspect = require "hs.inspect"
+local mouse = require "hs.mouse"
 local screen = require "hs.screen"
 local timer = require "hs.timer"
 local toolbar = require "hs.webview.toolbar"
@@ -515,7 +516,20 @@ function mod.selectPanel(id)
  offset = -20
  end
 
- mod._webview:size({w = mod.DEFAULT_WIDTH, h = height + offset})
+ --------------------------------------------------------------------------------
+ -- Make sure the panel isn't bigger than the screen:
+ --------------------------------------------------------------------------------
+ local heightWithOffset = height + offset
+
+ local currentScreen = mouse.getCurrentScreen()
+ local currentFrame = currentScreen and currentScreen:frame()
+ local currentHeight = currentFrame and currentFrame.h
+
+ if heightWithOffset > currentHeight then
+ heightWithOffset = currentHeight - 10
+ end
+
+ mod._webview:size({w = mod.DEFAULT_WIDTH, h = heightWithOffset})
  end
 
  end

src/plugins/core/watchfolders/manager/html/panels.html

@@ -6,7 +6,8 @@
  background-color: #1f1f1f;
  font-family: -apple-system;
  font-size: 13px;
- overflow:hidden;
+ max-width: 100%;
+ overflow-x: hidden;
  color: #999999;
  }
  a {

src/plugins/core/watchfolders/manager/init.lua

@@ -9,6 +9,7 @@ local hs = _G.hs
 local log = require "hs.logger".new "watchMan"
 
 local inspect = require "hs.inspect"
+local mouse = require "hs.mouse"
 local screen = require "hs.screen"
 local timer = require "hs.timer"
 local toolbar = require "hs.webview.toolbar"
@@ -447,7 +448,20 @@ function mod.selectPanel(id)
  -- Resize Panel:
  --------------------------------------------------------------------------------
  if v.id == id and v.height and type(v.height) == "number" and mod._webview:hswindow() and mod._webview:hswindow():isVisible() then
- mod._webview:size({w = mod.DEFAULT_WIDTH, h = v.height })
+ --------------------------------------------------------------------------------
+ -- Make sure the panel isn't bigger than the screen:
+ --------------------------------------------------------------------------------
+ local heightWithOffset = v.height
+
+ local currentScreen = mouse.getCurrentScreen()
+ local currentFrame = currentScreen and currentScreen:frame()
+ local currentHeight = currentFrame and currentFrame.h
+
+ if heightWithOffset > currentHeight then
+ heightWithOffset = currentHeight - 10
+ end
+
+ mod._webview:size({w = mod.DEFAULT_WIDTH, h = heightWithOffset})
  end
 
  local style = v.id == id and "block" or "none"