respect icon width when computing the correct text width

257290

Change-Id: Iedab36e85cf7d6527448a633286247f93bd1113c
Reviewed-on: https://git.eclipse.org/r/156239
Tested-by: CI Bot
Reviewed-by: Andre Wegmueller <awe@bsiag.com>

1 files changed, 18 insertions, 7 deletions

diff --git a/org.eclipse.scout.rt.ui.html/src/main/js/scout/desktop/outline/PageLayout.js b/org.eclipse.scout.rt.ui.html/src/main/js/scout/desktop/outline/PageLayout.js
index 9350867d2a..5a12f72260 100644
--- a/org.eclipse.scout.rt.ui.html/src/main/js/scout/desktop/outline/PageLayout.js
+++ b/org.eclipse.scout.rt.ui.html/src/main/js/scout/desktop/outline/PageLayout.js
@@ -23,18 +23,24 @@ scout.PageLayout.prototype.layout = function($container) {
     titleHeight = 0,
     iconHeight = 0,
     nodeMenuBar = this.outline.nodeMenuBar,
-    nodeMenuBarWidth = 0,
     detailMenuBar = this.outline.detailMenuBar,
-    detailMenuBarHeight = 0;
+    detailMenuBarHeight = 0,
+    textWidth = 0;
 
   containerSize = htmlContainer.availableSize()
     .subtract(htmlContainer.insets());
+  textWidth = containerSize.width;
+
+  if ($icon.length > 0) {
+    textWidth -= scout.graphics.prefSize($icon).width;
+  }
 
   if (nodeMenuBar.visible) {
-    nodeMenuBarWidth = nodeMenuBar.htmlComp.prefSize().width;
-    $text.cssWidth(containerSize.width - nodeMenuBarWidth);
+    textWidth -= nodeMenuBar.htmlComp.prefSize().width;
   }
 
+  $text.cssWidth(textWidth);
+
   if (detailMenuBar.visible) {
     detailMenuBarHeight = detailMenuBar.htmlComp.prefSize().height;
     detailMenuBarSize = new scout.Dimension(containerSize.width, detailMenuBarHeight)
@@ -62,19 +68,24 @@ scout.PageLayout.prototype.preferredLayoutSize = function($container) {
     detailMenuBar = this.outline.detailMenuBar,
     detailMenuBarPrefSize = new scout.Dimension(),
     nodeMenuBar = this.outline.nodeMenuBar,
-    nodeMenuBarWidth = 0;
+    textWidth = 0;
 
   containerSize = htmlContainer.size()
     .subtract(htmlContainer.insets());
+  textWidth = containerSize.width;
+
+  if ($icon.length > 0) {
+    textWidth -= scout.graphics.prefSize($icon).width;
+  }
 
   if (nodeMenuBar.visible) {
-    nodeMenuBarWidth = nodeMenuBar.htmlComp.prefSize().width;
+    textWidth -= nodeMenuBar.htmlComp.prefSize().width;
   }
 
   // needs a width to be able to calculate the pref height -> container width needs to be correct already
   textHeight = scout.graphics.prefSize($text, {
     includeMargin: true,
-    widthHint: containerSize.width - nodeMenuBarWidth
+    widthHint: textWidth
   }).height;
 
   if ($icon.length > 0) {