Merge pull request #379 from zowe/bugfix/date-tray-formatting

Fixed date tray to scale better with localization
zowe · Nov 8, 2021 · 16fce32 · 16fce32
2 parents 77b0951 + 96e96b4
commit 16fce32
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git 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

diff --git a/...dow-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.html b/...dow-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.html
@@ -48,14 +48,14 @@ <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>
+    <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>

diff --git a/...indow-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.ts b/...indow-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>();