From b462c078914bc8dc34efb1ae3d793dc549b3c674 Mon Sep 17 00:00:00 2001
From: Leanid Astrakou <lastrakou@rocketsoftware.com>
Date: Thu, 4 Nov 2021 21:22:44 -0400
Subject: [PATCH 1/4] Fixed date tray to scale better with localization

Signed-off-by: Leanid Astrakou <lastrakou@rocketsoftware.com>
---
 .../launchbar-widget/launchbar-widget.component.html          | 4 ++--
 .../launchbar/launchbar-widget/launchbar-widget.component.ts  | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.html
index 677dfcba9..c379c8984 100644
--- a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.html
+++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.html
@@ -48,11 +48,11 @@ <h6 class="launchbar-plugin-version" [style.color]="color.launchbarMenuText" id=
 </div>
 
 <div class="widget-area"
-     [style.min-width]="areaSize"
+     [style.width]="areaSize"
      [style.background]="color.launchbarColor"
      [style.border-radius]="borderRadius"
      id="ZAP_DesktopHome_WidgetArea">
-  <div class="clock two-row" *ngIf="clockTwoRow" [style.font-size]="fontSize" [style.padding-top]="clockOffset" id="ZAP_DesktopHome_LaunchbarClock">
+  <div class="clock two-row" *ngIf="clockTwoRow" [style.width]="clockWidth" [style.font-size]="fontSize" [style.padding-top]="clockOffset" id="ZAP_DesktopHome_LaunchbarClock">
     <span id="ZAP_DesktopHome_TimeLabel">{{date | date:'shortTime'}}</span>
     <br>
     <span id="ZAP_DesktopHome_DateLabel">{{date | date:'shortDate'}}</span>
diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.ts
index 4f8b71b2d..b95110e91 100644
--- a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.ts
+++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.ts
@@ -46,6 +46,7 @@ export class LaunchbarWidgetComponent implements MVDHosting.ZoweNotificationWatc
   
   public clockTwoRow: boolean = true;
   public clockOffset: string;
+  public clockWidth: string;
   public widgetOffset: string;
   public widgetSize: string;
   public areaSize: string;
@@ -111,6 +112,7 @@ export class LaunchbarWidgetComponent implements MVDHosting.ZoweNotificationWatc
         this.notifLeftOffset = '10px';
         break;      
     }
+    this.clockWidth = '61px';
   }
 
   @Output() popupStateChanged = new EventEmitter<boolean>(); 

From ff7f07d364c45c6e44e3f498e092867b8870bd35 Mon Sep 17 00:00:00 2001
From: Leanid Astrakou <lastrakou@rocketsoftware.com>
Date: Thu, 4 Nov 2021 21:26:30 -0400
Subject: [PATCH 2/4] CHANGELOG

Signed-off-by: Leanid Astrakou <lastrakou@rocketsoftware.com>
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29c7e8b0a..2ba0ba0b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the Zlux App Manager will be documented in this file.
 
+## `1.26.0`
+
+- Fixed small bug with app tray not scaling well with some localizations
+
 ## `1.25.0`
 
 - Fixed a bug where using app2app with incorrectly formatted data would not honor launch/message request

From 5acbe9013fb28f520697679e092a52a77bebbd5c Mon Sep 17 00:00:00 2001
From: Leanid Astrakou <lastrakou@rocketsoftware.com>
Date: Thu, 4 Nov 2021 21:35:15 -0400
Subject: [PATCH 3/4] Adjusted size for some max size/zoomed in views

Signed-off-by: Leanid Astrakou <lastrakou@rocketsoftware.com>
---
 .../launchbar/launchbar-widget/launchbar-widget.component.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.html
index c379c8984..eea69f266 100644
--- a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.html
+++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.html
@@ -55,7 +55,7 @@ <h6 class="launchbar-plugin-version" [style.color]="color.launchbarMenuText" id=
   <div class="clock two-row" *ngIf="clockTwoRow" [style.width]="clockWidth" [style.font-size]="fontSize" [style.padding-top]="clockOffset" id="ZAP_DesktopHome_LaunchbarClock">
     <span id="ZAP_DesktopHome_TimeLabel">{{date | date:'shortTime'}}</span>
     <br>
-    <span id="ZAP_DesktopHome_DateLabel">{{date | date:'shortDate'}}</span>
+    <span id="ZAP_DesktopHome_DateLabel" style="margin-left: -7px;" >{{date | date:'shortDate'}}</span>
   </div>
   <div class="clock" *ngIf="!clockTwoRow" [style.font-size]="fontSize" [style.padding-top]="clockOffset">
     <span>{{date | date:'shortDate'}} {{date | date:'shortTime'}}</span>

From 96e96b48142ef3fa8045e7664262da33b3dec402 Mon Sep 17 00:00:00 2001
From: Leanid Astrakou <lastrakou@rocketsoftware.com>
Date: Thu, 4 Nov 2021 21:45:36 -0400
Subject: [PATCH 4/4] Offset for Firefox and Edge

Signed-off-by: Leanid Astrakou <lastrakou@rocketsoftware.com>
---
 .../launchbar/launchbar-widget/launchbar-widget.component.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.html
index eea69f266..465d914c5 100644
--- a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.html
+++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.html
@@ -55,7 +55,7 @@ <h6 class="launchbar-plugin-version" [style.color]="color.launchbarMenuText" id=
   <div class="clock two-row" *ngIf="clockTwoRow" [style.width]="clockWidth" [style.font-size]="fontSize" [style.padding-top]="clockOffset" id="ZAP_DesktopHome_LaunchbarClock">
     <span id="ZAP_DesktopHome_TimeLabel">{{date | date:'shortTime'}}</span>
     <br>
-    <span id="ZAP_DesktopHome_DateLabel" style="margin-left: -7px;" >{{date | date:'shortDate'}}</span>
+    <span id="ZAP_DesktopHome_DateLabel" style="margin-left: -14px;" >{{date | date:'shortDate'}}</span>
   </div>
   <div class="clock" *ngIf="!clockTwoRow" [style.font-size]="fontSize" [style.padding-top]="clockOffset">
     <span>{{date | date:'shortDate'}} {{date | date:'shortTime'}}</span>