From 432c757b05a5a8db045fdab43671740cd70214f0 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Tue, 17 Dec 2019 08:51:46 -0500 Subject: [PATCH 01/35] Force context menu to close when window is resized Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts index 6b9173005..00d7c94dd 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts @@ -98,6 +98,11 @@ export class ContextMenuComponent { this.closeContextMenu(); } } + + @HostListener('window:resize') + onResize(): void { + this.closeContextMenu(); + } } From 0e84cbe95db2c462901b53bcd890f991ffa1fb1d Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Tue, 17 Dec 2019 08:53:18 -0500 Subject: [PATCH 02/35] Remove focus from context menu items when cursor moves off menu (currently it's removed only if cursor moves over a different menu item) Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html index 6b5b59723..bd83a969a 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html @@ -15,12 +15,12 @@ -
  • +
  • {{menuItem.text}}
    • -
  • +
  • {{menuItem.text}}
    From 881d444aae4fc57a2b23e7915b2d63cb223c7d00 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Tue, 17 Dec 2019 08:55:28 -0500 Subject: [PATCH 03/35] Add functionality to handle all scenarios in which context menu approaches any edge of screen Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.html | 59 ++++++++++--------- .../context-menu/context-menu.component.ts | 18 ++++-- 2 files changed, 44 insertions(+), 33 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html index bd83a969a..0f856d6ef 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html @@ -11,34 +11,35 @@ -->
    -
      - - - -
    • - {{menuItem.text}} -
      • -       - -
    • - {{menuItem.text}} -
      -
      - -
      -
      • -       -       -
    -
    - - - Copyright Contributors to the Zowe Project. ---> - + \ No newline at end of file diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts index 00d7c94dd..e662a9689 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts @@ -23,15 +23,15 @@ import { BaseLogger } from 'virtual-desktop-logger'; }) export class ContextMenuComponent { hovering: ContextMenuItem; - newX: number; - newY: number; + newX: number; // distance from left side of browser to left side of menu + newY: number; // distance from top of browser to top of menu @ViewChild('contextmenu') set menu(contextmenu: any) { contextmenu.nativeElement.style.opacity = 0; setTimeout(() => { - let menuHeight = contextmenu.nativeElement.clientHeight; - let menuWidth = contextmenu.nativeElement.clientWidth; + let menuHeight = contextmenu.nativeElement.clientHeight; // Get inital menu height + let menuWidth = contextmenu.nativeElement.clientWidth; // Het initial menu width this.newY = this.validateY(this.newY, menuHeight); this.newX = this.validateX(this.newX, menuWidth); contextmenu.nativeElement.style.opacity = 1; @@ -61,21 +61,31 @@ export class ContextMenuComponent { validateX(xPos: number, menuWidth: number): number { let menuRight = xPos + menuWidth; + let menuLeft = xPos; let screenWidth = window.innerWidth - 10; /* Gave a 10 pixel buffer so isn't right on the edge */ if (menuRight > screenWidth) { let difference = menuRight - screenWidth; xPos = xPos - difference } + if (menuLeft < 10) { + let difference = 10 - menuLeft; + xPos = xPos + difference; + } return xPos; } validateY(yPos: number, menuHeight: number): number { let menuBottom = menuHeight + yPos; + let menuTop = yPos; let screenHeight = window.innerHeight - 10; /* Gave a 10 pixel buffer so isn't right on the edge */ if (menuBottom > screenHeight) { let difference = menuBottom - screenHeight; yPos = yPos - difference; } + if (menuTop < 10) { + let difference = 10 - menuTop; + yPos = yPos + difference; + } return yPos; } From 5e114f4e8f93ae7c5c78ac3d21c0abe6bf752f75 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Tue, 17 Dec 2019 08:59:12 -0500 Subject: [PATCH 04/35] Add rounding to corners of context menu to more easily distinguish between menus and sub-menus Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.css | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css index d017b544f..289957c2c 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css @@ -21,6 +21,16 @@ background-color:#a6a6a6; } +.context-menu .menu-item.top { + border-top-width: 1px; + border-radius: 4px 4px 0 0; +} + +.context-menu .menu-item.bottom { + border-bottom-width: 1px; + border-radius: 0 0 4px 4px; +} + .context-menu>ul { background-color:#eaeaea; list-style: none; From 38d87e362d608d246bb4b97889a23374461555d5 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Tue, 17 Dec 2019 09:20:54 -0500 Subject: [PATCH 05/35] Add keyboard navigability to context menu Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.css | 12 +- .../context-menu/context-menu.component.html | 91 ++++++---- .../context-menu/context-menu.component.ts | 164 +++++++++++++++--- 3 files changed, 211 insertions(+), 56 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css index 289957c2c..cae55c6dd 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css @@ -12,6 +12,7 @@ .context-menu { position: absolute; + margin-left: 2px; /* Offset menu so adjacent item is not automatically selected */ z-index: 20000; min-width: 180px; width: auto; @@ -32,7 +33,7 @@ } .context-menu>ul { - background-color:#eaeaea; + /* background-color:#eaeaea; */ list-style: none; padding: 0; margin: 0; @@ -48,12 +49,14 @@ font-weight: 400; white-space:nowrap; color:#404040; - border-bottom: 1px solid #ccc; + border-style: solid; + border-width: 0 1px 1px 1px; + border-color: #ccc; cursor: pointer; position:relative; } -.context-menu .multi-menu-item>.menu-expand-caret { +.context-menu .multi-menu-item .menu-expand-caret { position: absolute; margin: auto; top: 0; @@ -77,10 +80,11 @@ .context-menu .multi-menu-item>.submenu { width: 0; height: 0; - right: 0; + right: 1px; top: 0; position: absolute; display: none; + z-index: 1; } .context-menu .multi-menu-item>.submenu>com-rs-mvd-context-menu { diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html index 0f856d6ef..545ac20fc 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html @@ -10,36 +10,69 @@ Copyright Contributors to the Zowe Project. --> -
    -
      - - - -
    • - {{menuItem.text}} -
      • -       - -
    • +
      +
        + + + +
      • + {{menuItem.text}} +
        • +         + +
      • +
        {{menuItem.text}}
        -
        - -
        -
        • -         -         -
      -
      +
    +
    + +
    +
    • +     +     + + + + + SPDX-License-Identifier: EPL-2.0 - \ No newline at end of file + Copyright Contributors to the Zowe Project. +--> + diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts index e662a9689..4f4181877 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts @@ -10,7 +10,20 @@ Copyright Contributors to the Zowe Project. */ -import { Input, Component, EventEmitter, Output, HostListener, ElementRef, ViewChild } from '@angular/core'; +import { + Input, + Component, + EventEmitter, + Output, + HostListener, + ElementRef, + ViewChild, + ViewChildren, + AfterViewInit, + OnInit, + OnDestroy, + QueryList +} from '@angular/core'; import { ContextMenuItem } from 'pluginlib/inject-resources'; @@ -19,25 +32,36 @@ import { BaseLogger } from 'virtual-desktop-logger'; @Component({ selector: 'com-rs-mvd-context-menu', templateUrl: './context-menu.component.html', - styleUrls: ['./context-menu.component.css'] + styleUrls: ['./context-menu.component.css'], }) -export class ContextMenuComponent { +export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { hovering: ContextMenuItem; - newX: number; // distance from left side of browser to left side of menu - newY: number; // distance from top of browser to top of menu + newX: number; + newY: number; + activeIndex: number; // Index of active item in menu. -1 if none active. + _isChildMenu: boolean; // True if menu is child of another menu, false otherwise. + _isParentActive: boolean; // True if parent item is active (ie. menu should be displayed), false otherwise. + isNavigable: boolean; // True if menu is navigable, false otherwise. + _parentText: string; // Text of parent menu item + children: { [key: string]: any }; @ViewChild('contextmenu') set menu(contextmenu: any) { contextmenu.nativeElement.style.opacity = 0; setTimeout(() => { - let menuHeight = contextmenu.nativeElement.clientHeight; // Get inital menu height - let menuWidth = contextmenu.nativeElement.clientWidth; // Het initial menu width + let menuHeight = contextmenu.nativeElement.clientHeight; + let menuWidth = contextmenu.nativeElement.clientWidth; this.newY = this.validateY(this.newY, menuHeight); this.newX = this.validateX(this.newX, menuWidth); contextmenu.nativeElement.style.opacity = 1; + this.activeIndex = -1; // By default, no item is selected. + this._isParentActive = false; // Since by default no item is selected, all parent items are inactive. + this.isNavigable = !this._isChildMenu; // By default, surface-depth menu is navigable, and all others are not. }, 0); } + @ViewChildren(ContextMenuComponent) _children: QueryList; + @Input() set xPos(xPos: number) { this.newX = xPos; }; @@ -45,47 +69,109 @@ export class ContextMenuComponent { @Input() set yPos(yPos: number) { this.newY = yPos; }; - + @Input() menuItems: ContextMenuItem[]; + + // Declare value of _isChildMenu based on input isChildMenu + // This is set on every child menu + @Input() set isChildMenu(isChildMenu: boolean) { + this._isChildMenu = isChildMenu; + }; + + // Set values of _isParentActive and activeIndex based on input isParentActive + // _isParentActive set to true by parent menu if activeIndex of parent menu corresponds to this child menu + // activeIndex set to existing value of activeIndex if parent is active (ie. child menu visible), -1 otherwise, so that any active item in child menu reset when child meny disappears, thus none selected when it reappears. + @Input() set isParentActive(isParentActive: boolean) { + this._isParentActive = isParentActive; // Set _isParentActive based on input + this.activeIndex = isParentActive ? this.activeIndex : -1; // If parent not active, reset this.activeIndex to -1 + }; + + // Set value of isNavigable based on input parentNavigable. + // If parent menu is navigable, child menu cannot be. + @Input() set parentNavigable(parentNavigable: boolean) { + if (parentNavigable) { + this.isNavigable = false; + } + }; + + @Input() set parentText(parentText: string) { + this._parentText = parentText; + }; + + @Output() complete: EventEmitter; + @Output() makeParentUnnavigable = new EventEmitter(); + + @Output() makeParentNavigable = new EventEmitter(); + + @Output() sendRefToParent = new EventEmitter(); + private readonly logger: ZLUX.ComponentLogger = BaseLogger; constructor( - private elementRef: ElementRef, + private elementRef: ElementRef //private logger: DesktopLogger - ) { + ) { this.complete = new EventEmitter(); } + // Make menu navigable, and emit makeParentUnnavigable event. + // Emitting makeParentUnnavigable event will trigger any parent menu to call makeUnnavigable(). + makeNavigable = () => { + // Make navigable + this.isNavigable = true; + // If menu has parent, un-focus parent + if (this._isChildMenu) { + this.makeParentUnnavigable.emit() + } + } + + // Make menu unnavigable, and emit makeParentUnnavigable event. + // Emitting makeParentUnnavigable event will recursively make all subsequent parent menus call makeUnnavigable(). + makeUnnavigable() { + // Make un-navigable + this.isNavigable = false; + // If menu has parent, un-focus parent + if (this._isChildMenu) { + this.makeParentUnnavigable.emit() + } + } + + ngOnInit() { + } + + ngOnDestroy() { + } + + ngAfterViewInit() { + this.elementRef.nativeElement.focus() + this.children = this._children.toArray().reduce((acc, curr) => ( + { + ...acc, + [curr._parentText]: curr + } + ), {}) + } + validateX(xPos: number, menuWidth: number): number { let menuRight = xPos + menuWidth; - let menuLeft = xPos; let screenWidth = window.innerWidth - 10; /* Gave a 10 pixel buffer so isn't right on the edge */ if (menuRight > screenWidth) { let difference = menuRight - screenWidth; xPos = xPos - difference } - if (menuLeft < 10) { - let difference = 10 - menuLeft; - xPos = xPos + difference; - } return xPos; } validateY(yPos: number, menuHeight: number): number { let menuBottom = menuHeight + yPos; - let menuTop = yPos; let screenHeight = window.innerHeight - 10; /* Gave a 10 pixel buffer so isn't right on the edge */ if (menuBottom > screenHeight) { let difference = menuBottom - screenHeight; yPos = yPos - difference; } - if (menuTop < 10) { - let difference = 10 - menuTop; - yPos = yPos + difference; - } return yPos; } @@ -102,6 +188,10 @@ export class ContextMenuComponent { this.complete.emit(); } + setActiveIndex = (index: number) => { + this.activeIndex = index; + } + @HostListener('document:mousedown', ['$event']) onMouseDown(event: MouseEvent): void { if (event && !this.elementRef.nativeElement.contains(event.target)) { @@ -109,9 +199,37 @@ export class ContextMenuComponent { } } - @HostListener('window:resize') - onResize(): void { - this.closeContextMenu(); + @HostListener('window:keydown', ['$event']) + onWindowKeyDown(event: KeyboardEvent) { + let mod = (x: number, n: number): number => ((x == -2 ? -1 : x % n) + n) % n; + let hasChildren; + if (this.activeIndex > -1) { + hasChildren = this.menuItems && this.menuItems[this.activeIndex].children ? true : false; + } + if (this.isNavigable) { + switch (event.key){ + case 'ArrowUp': + this.activeIndex = mod(this.activeIndex - 1, this.menuItems.length) + break; + case 'ArrowDown': + this.activeIndex = mod(this.activeIndex + 1, this.menuItems.length) + break; + case 'ArrowRight': + if (hasChildren) { + this.makeUnnavigable(); // Make un-navigable because navigability will transfer to child menu + setTimeout(() => { + this.children[this.menuItems[this.activeIndex].text].makeNavigable(); + this.children[this.menuItems[this.activeIndex].text].setActiveIndex(0); + }, 0) + } + break; + case 'ArrowLeft': + if (this.isNavigable) { + this.makeParentNavigable.emit(); + this.setActiveIndex(-1); + } + } + } } } From 58ec1325ad8c518ad24be7fc7c994443f64c8cdd Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Tue, 17 Dec 2019 12:29:15 -0500 Subject: [PATCH 06/35] Add functionality to allow icons for context menu items Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.css | 14 ++++++++++++++ .../context-menu/context-menu.component.html | 16 ++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css index cae55c6dd..0fd85fc91 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css @@ -97,6 +97,20 @@ border-bottom: none; } +.icon { + width: 19px; + margin-right: 5px; + background-size: contain; +} + +.icon-person { + background-image: url(../../../../assets/images/contextmenu/person.png); +} + +.icon-settings { + background-image: url(../../../../assets/images/contextmenu/settings.png); +} + /* This program and the accompanying materials are made available under the terms of the Eclipse Public License v2.0 which accompanies diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html index 545ac20fc..5f5aca1cf 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html @@ -29,7 +29,12 @@ (click)='itemClicked(menuItem); $event.stopPropagation(); closeContextMenu()' (mouseover)="this.activeIndex=i; makeNavigable(); $event.stopPropagation();" > - {{menuItem.text}} +
    +
    +
    {{menuItem.text}}
    +
    @@ -40,10 +45,13 @@ [class.bottom]="i==menuItems.length-1" (mouseover)="this.activeIndex=i; makeNavigable(); $event.stopPropagation();" > -
    - {{menuItem.text}} -
    +
    +
    +
    {{menuItem.text}}
    +
    Date: Tue, 17 Dec 2019 12:57:55 -0500 Subject: [PATCH 07/35] Add functionality to allow user to select menu item by clicking Enter Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.html | 1 + .../context-menu/context-menu.component.ts | 22 ++++++++++++++----- .../src/pluginlib/inject-resources.ts | 1 + 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html index 5f5aca1cf..452e552e2 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html @@ -43,6 +43,7 @@ [class.active]="i==this.activeIndex" [class.top]="i==0" [class.bottom]="i==menuItems.length-1" + (click)='itemClicked(menuItem); $event.stopPropagation(); closeContextMenu()' (mouseover)="this.activeIndex=i; makeNavigable(); $event.stopPropagation();" >
    diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts index 4f4181877..80a2235e2 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts @@ -192,12 +192,16 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { this.activeIndex = index; } - @HostListener('document:mousedown', ['$event']) - onMouseDown(event: MouseEvent): void { - if (event && !this.elementRef.nativeElement.contains(event.target)) { - this.closeContextMenu(); - } - } + // @HostListener('document:mousedown', ['$event']) + // onMouseDown(event: MouseEvent): void { + // event.stopPropagation(); + // console.log("goodbye: ", this.menuItems[this.activeIndex]) + // setTimeout(() => { + // if (event && !this.elementRef.nativeElement.contains(event.target)) { + // this.closeContextMenu(); + // } + // }, 0) + // } @HostListener('window:keydown', ['$event']) onWindowKeyDown(event: KeyboardEvent) { @@ -228,6 +232,12 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { this.makeParentNavigable.emit(); this.setActiveIndex(-1); } + break; + case 'Enter': + if (this.menuItems[this.activeIndex].action) { + this.menuItems[this.activeIndex].action(); + } + this.closeContextMenu(); } } } diff --git a/virtual-desktop/src/pluginlib/inject-resources.ts b/virtual-desktop/src/pluginlib/inject-resources.ts index 6a5a6b754..97c86575b 100644 --- a/virtual-desktop/src/pluginlib/inject-resources.ts +++ b/virtual-desktop/src/pluginlib/inject-resources.ts @@ -70,6 +70,7 @@ export interface Angular2PluginEmbedActions { export interface ContextMenuItem { text: string; + icon?: string; action: () => void; children?: ContextMenuItem[]; } From ea77b0e7134b511d6d5f958c3eebb4b2f5d1aeb3 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Fri, 20 Dec 2019 11:26:15 -0500 Subject: [PATCH 08/35] Re-add functionality that was lost in previous commit to close context menu when window is resized or user clicks outside of menu Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.css | 11 ++++++++++ .../context-menu/context-menu.component.html | 17 +++++++------- .../context-menu/context-menu.component.ts | 22 +++++++++++++++++++ .../src/pluginlib/inject-resources.ts | 1 + 4 files changed, 42 insertions(+), 9 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css index 0fd85fc91..49d8151b9 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css @@ -97,8 +97,13 @@ border-bottom: none; } +.menuitem-content { + display: flex; +} + .icon { width: 19px; + height: 19px; margin-right: 5px; background-size: contain; } @@ -111,6 +116,12 @@ background-image: url(../../../../assets/images/contextmenu/settings.png); } +.shortcut { + margin-left: 15px; + right: 5px; + font-weight: bold; +} + /* This program and the accompanying materials are made available under the terms of the Eclipse Public License v2.0 which accompanies diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html index 452e552e2..4a0dc96d9 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html @@ -29,11 +29,12 @@ (click)='itemClicked(menuItem); $event.stopPropagation(); closeContextMenu()' (mouseover)="this.activeIndex=i; makeNavigable(); $event.stopPropagation();" > -
    -
    -
    {{menuItem.text}}
    +
    +
    +
    +
    {{menuItem.text}}
    +
    +
    {{menuItem.shortcut}}
    @@ -46,10 +47,8 @@ (click)='itemClicked(menuItem); $event.stopPropagation(); closeContextMenu()' (mouseover)="this.activeIndex=i; makeNavigable(); $event.stopPropagation();" > -
    -
    +
    +
    {{menuItem.text}}
    diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts index 80a2235e2..7479f5a86 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts @@ -157,21 +157,31 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { validateX(xPos: number, menuWidth: number): number { let menuRight = xPos + menuWidth; + let menuLeft = xPos; let screenWidth = window.innerWidth - 10; /* Gave a 10 pixel buffer so isn't right on the edge */ if (menuRight > screenWidth) { let difference = menuRight - screenWidth; xPos = xPos - difference } + if (menuLeft < 10) { + let difference = 10 - menuLeft; + xPos = xPos + difference; + } return xPos; } validateY(yPos: number, menuHeight: number): number { let menuBottom = menuHeight + yPos; + let menuTop = yPos; let screenHeight = window.innerHeight - 10; /* Gave a 10 pixel buffer so isn't right on the edge */ if (menuBottom > screenHeight) { let difference = menuBottom - screenHeight; yPos = yPos - difference; } + if (menuTop < 10) { + let difference = 10 - menuTop; + yPos = yPos + difference; + } return yPos; } @@ -203,6 +213,18 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { // }, 0) // } + @HostListener('document:mousedown', ['$event']) + onMouseDown(event: MouseEvent): void { + if (event && !this.elementRef.nativeElement.contains(event.target)) { + this.closeContextMenu(); + } + } + + @HostListener('window:resize') + onResize(): void { + this.closeContextMenu(); + } + @HostListener('window:keydown', ['$event']) onWindowKeyDown(event: KeyboardEvent) { let mod = (x: number, n: number): number => ((x == -2 ? -1 : x % n) + n) % n; diff --git a/virtual-desktop/src/pluginlib/inject-resources.ts b/virtual-desktop/src/pluginlib/inject-resources.ts index 97c86575b..f043400c5 100644 --- a/virtual-desktop/src/pluginlib/inject-resources.ts +++ b/virtual-desktop/src/pluginlib/inject-resources.ts @@ -71,6 +71,7 @@ export interface Angular2PluginEmbedActions { export interface ContextMenuItem { text: string; icon?: string; + shortcut?: string; action: () => void; children?: ContextMenuItem[]; } From c634a06d7bbab0a7b701dbf5fb87b3648017ded2 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Fri, 20 Dec 2019 13:39:08 -0500 Subject: [PATCH 09/35] Fix menu positioning issues arising from spawning context menu via spawnContextMenu() rather than Window Manager Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.css | 6 +++--- .../context-menu/context-menu.component.html | 4 ++-- .../context-menu/context-menu.component.ts | 12 +++++++----- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css index 49d8151b9..78684936c 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css @@ -87,9 +87,9 @@ z-index: 1; } -.context-menu .multi-menu-item>.submenu>com-rs-mvd-context-menu { - margin: -10px; - padding: 10px; +.context-menu .multi-menu-item>.submenu>com-rs-mvd-context-menu>.context-menu { + left: 0; + top: 0; } diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html index 4a0dc96d9..420574854 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html @@ -55,8 +55,8 @@
    { + setTimeout(() => { let menuHeight = contextmenu.nativeElement.clientHeight; let menuWidth = contextmenu.nativeElement.clientWidth; - this.newY = this.validateY(this.newY, menuHeight); - this.newX = this.validateX(this.newX, menuWidth); + if (!this._isChildMenu) { + this.newY = this.validateY(this.newY, menuHeight); + this.newX = this.validateX(this.newX, menuWidth); + } contextmenu.nativeElement.style.opacity = 1; this.activeIndex = -1; // By default, no item is selected. this._isParentActive = false; // Since by default no item is selected, all parent items are inactive. @@ -158,7 +160,7 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { validateX(xPos: number, menuWidth: number): number { let menuRight = xPos + menuWidth; let menuLeft = xPos; - let screenWidth = window.innerWidth - 10; /* Gave a 10 pixel buffer so isn't right on the edge */ + let screenWidth = window.innerWidth - 20; /* Gave a 10 pixel buffer so isn't right on the edge */ if (menuRight > screenWidth) { let difference = menuRight - screenWidth; xPos = xPos - difference @@ -173,7 +175,7 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { validateY(yPos: number, menuHeight: number): number { let menuBottom = menuHeight + yPos; let menuTop = yPos; - let screenHeight = window.innerHeight - 10; /* Gave a 10 pixel buffer so isn't right on the edge */ + let screenHeight = window.innerHeight - 20; /* Gave a 10 pixel buffer so isn't right on the edge */ if (menuBottom > screenHeight) { let difference = menuBottom - screenHeight; yPos = yPos - difference; From b38ef067b703e4489947582196bdeacf89908811 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Fri, 20 Dec 2019 13:49:45 -0500 Subject: [PATCH 10/35] Prevent bottom border of last item in context menu from being removed Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css index 78684936c..da853fcb4 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css @@ -92,11 +92,6 @@ top: 0; } - -.context-menu .menu-item:last-child { - border-bottom: none; -} - .menuitem-content { display: flex; } From b7372c71b6f5c44562c7c9695c6ed3f3295905f9 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Fri, 20 Dec 2019 14:51:46 -0500 Subject: [PATCH 11/35] Refactor contextmenu component to prevent parent menu from going off screen in all edge cases Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.ts | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts index 38fd2c63a..6079170cc 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts @@ -49,8 +49,8 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { set menu(contextmenu: any) { contextmenu.nativeElement.style.opacity = 0; setTimeout(() => { - let menuHeight = contextmenu.nativeElement.clientHeight; - let menuWidth = contextmenu.nativeElement.clientWidth; + let menuHeight = contextmenu.nativeElement.clientHeight + 2; + let menuWidth = contextmenu.nativeElement.clientWidth + 2; if (!this._isChildMenu) { this.newY = this.validateY(this.newY, menuHeight); this.newX = this.validateX(this.newX, menuWidth); @@ -158,12 +158,12 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { } validateX(xPos: number, menuWidth: number): number { - let menuRight = xPos + menuWidth; let menuLeft = xPos; - let screenWidth = window.innerWidth - 20; /* Gave a 10 pixel buffer so isn't right on the edge */ + let menuRight = xPos + menuWidth; + let screenWidth = window.innerWidth - 10; /* Gave a 10 pixel buffer so isn't right on the edge */ if (menuRight > screenWidth) { - let difference = menuRight - screenWidth; - xPos = xPos - difference + let overshoot = menuLeft - screenWidth; + xPos = xPos - (menuWidth + (overshoot > 0 ? overshoot : 0)) } if (menuLeft < 10) { let difference = 10 - menuLeft; @@ -173,12 +173,12 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { } validateY(yPos: number, menuHeight: number): number { - let menuBottom = menuHeight + yPos; let menuTop = yPos; - let screenHeight = window.innerHeight - 20; /* Gave a 10 pixel buffer so isn't right on the edge */ + let menuBottom = yPos + menuHeight; + let screenHeight = window.innerHeight - 10; /* Gave a 10 pixel buffer so isn't right on the edge */ if (menuBottom > screenHeight) { - let difference = menuBottom - screenHeight; - yPos = yPos - difference; + let overshoot = menuTop - screenHeight; + yPos = yPos - (menuHeight + (overshoot > 0 ? overshoot : 0)); } if (menuTop < 10) { let difference = 10 - menuTop; From 0c77e2a0f88669dc9391a7cebcfb9e0dfa9a5f5e Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Fri, 20 Dec 2019 16:07:40 -0500 Subject: [PATCH 12/35] Allow context menu to be spawned from clicking anywhere in the window Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.ts | 4 ++++ .../shared/window-manager.service.ts | 10 ++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts index 6079170cc..b3de75a50 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts @@ -38,6 +38,8 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { hovering: ContextMenuItem; newX: number; newY: number; + menuHeight: number; + menuWidth: number; activeIndex: number; // Index of active item in menu. -1 if none active. _isChildMenu: boolean; // True if menu is child of another menu, false otherwise. _isParentActive: boolean; // True if parent item is active (ie. menu should be displayed), false otherwise. @@ -56,6 +58,8 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { this.newX = this.validateX(this.newX, menuWidth); } contextmenu.nativeElement.style.opacity = 1; + this.menuHeight = menuHeight; + this.menuWidth = menuWidth; this.activeIndex = -1; // By default, no item is selected. this._isParentActive = false; // Since by default no item is selected, all parent items are inactive. this.isNavigable = !this._isChildMenu; // By default, surface-depth menu is navigable, and all others are not. diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/shared/window-manager.service.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/shared/window-manager.service.ts index 1c238c3da..77b312f58 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/shared/window-manager.service.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/shared/window-manager.service.ts @@ -673,14 +673,8 @@ export class WindowManagerService implements MVDWindowManagement.WindowManagerSe const windowPos = desktopWindow.windowState.position; const newX = isAbsolutePos ? x : windowPos.left + x; const newY = isAbsolutePos ? y : windowPos.top + y + WindowManagerService.WINDOW_HEADER_HEIGHT; - if ((newX >= windowPos.left && newX <= (windowPos.left+windowPos.width)) - && (newY >= windowPos.top && newY <= (windowPos.top+windowPos.height))) { - this.contextMenuRequested.next({xPos: newX, yPos: newY, items: items}); - return true; - } else { - this.logger.warn(`Rejecting context menu due to invalid coord ${newX},${newY} for app at ${windowPos.left},${windowPos.top} w=${windowPos.width}, h=${windowPos.height}`); - return false; - } + this.contextMenuRequested.next({xPos: newX, yPos: newY, items: items}); + return true; } setDesktopTitle(title?:String) { From 0436363822cd36079d33369770023de795412faf Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Sun, 22 Dec 2019 11:19:12 -0500 Subject: [PATCH 13/35] Add slight offset to original spawn position of context menu, so that cursor is not automatically hovering over menu element Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.ts | 8 ++++---- .../launchbar/launchbar/launchbar.component.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts index b3de75a50..e002e3616 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts @@ -51,8 +51,8 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { set menu(contextmenu: any) { contextmenu.nativeElement.style.opacity = 0; setTimeout(() => { - let menuHeight = contextmenu.nativeElement.clientHeight + 2; - let menuWidth = contextmenu.nativeElement.clientWidth + 2; + let menuHeight = contextmenu.nativeElement.clientHeight; + let menuWidth = contextmenu.nativeElement.clientWidth; if (!this._isChildMenu) { this.newY = this.validateY(this.newY, menuHeight); this.newX = this.validateX(this.newX, menuWidth); @@ -69,11 +69,11 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { @ViewChildren(ContextMenuComponent) _children: QueryList; @Input() set xPos(xPos: number) { - this.newX = xPos; + this.newX = xPos + 2; }; @Input() set yPos(yPos: number) { - this.newY = yPos; + this.newY = yPos + 4; }; @Input() menuItems: ContextMenuItem[]; diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar/launchbar.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar/launchbar.component.ts index 869590ac5..9d2cc57bc 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar/launchbar.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar/launchbar.component.ts @@ -146,7 +146,7 @@ export class LaunchbarComponent { onRightClick(event: MouseEvent, item: LaunchbarItem): boolean { let menuItems: ContextMenuItem[] = generateInstanceActions(item, this.pluginsDataService, this.translation, this.applicationManager, this.windowManager); - this.windowManager.contextMenuRequested.next({xPos: event.clientX, yPos: event.clientY - 60, items: menuItems}); + this.windowManager.contextMenuRequested.next({xPos: event.clientX, yPos: event.clientY, items: menuItems}); return false; } From 3e3e3f4dfe234aa222a1bd44e6072b996dcfba1a Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Tue, 24 Dec 2019 14:35:17 -0500 Subject: [PATCH 14/35] Add all functionality for submmenus to propagate left instead of right if parent menu is too close to right edge Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.css | 51 ++++++++++++++-- .../context-menu/context-menu.component.html | 37 ++++++++--- .../context-menu/context-menu.component.ts | 61 +++++++++++++++---- 3 files changed, 122 insertions(+), 27 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css index da853fcb4..8efdb6090 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css @@ -12,7 +12,7 @@ .context-menu { position: absolute; - margin-left: 2px; /* Offset menu so adjacent item is not automatically selected */ + /* margin-left: 2px; Offset menu so adjacent item is not automatically selected */ z-index: 20000; min-width: 180px; width: auto; @@ -69,6 +69,15 @@ border-left: 5px solid #666; } +.context-menu .multi-menu-item .menu-expand-caret.propagateChildLeft { + left: 5px; + margin: auto; + margin-left: 0; + margin-right: 0; + border-left: none; + border-right: 5px solid #666; +} + .context-menu .multi-menu-item.active>.menu-expand-caret { border-left: 5px solid #fff; } @@ -78,22 +87,52 @@ } .context-menu .multi-menu-item>.submenu { - width: 0; - height: 0; - right: 1px; + /* propagate right */ + right: 0px; + /* propagate left */ + /* left: 0px; */ top: 0; position: absolute; display: none; z-index: 1; } +.context-menu .multi-menu-item>.submenu.propagateChildLeft { + left: 0px; +} + +.test { + width: 20px; + height: 20px; + border: 1px solid blue; +} + +/* .context-menu .multi-menu-item>.submenu .propagateChildLeft { + right: 50px; +} + +.context-menu .multi-menu-item>.submenu .propagateChildUp { + top: 50px; +} */ + .context-menu .multi-menu-item>.submenu>com-rs-mvd-context-menu>.context-menu { left: 0; top: 0; } +.context-menu .multi-menu-item>.submenu>com-rs-mvd-context-menu>.context-menu.propagateChildLeft>ul { + position: absolute; + right: 100%; +} + .menuitem-content { display: flex; + justify-content: space-between; +} + +.menuitem-content-left { + display: flex; + margin-right: 15px; } .icon { @@ -103,6 +142,10 @@ background-size: contain; } +.icon.propagateChildLeft { + margin-left: 25px; +} + .icon-person { background-image: url(../../../../assets/images/contextmenu/person.png); } diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html index 420574854..9cc09605c 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html @@ -15,6 +15,8 @@ #contextmenu [style.left.px]='this.newX' [style.top.px]='this.newY' + [class.propagateChildLeft]="this._propagateChildLeft" + [class.propagateChildUp]="this._propagateChildUp" [class.navigable]='this.isNavigable' >
      @@ -29,8 +31,8 @@ (click)='itemClicked(menuItem); $event.stopPropagation(); closeContextMenu()' (mouseover)="this.activeIndex=i; makeNavigable(); $event.stopPropagation();" > -
      -
      +
      +
      {{menuItem.text}}
      @@ -47,27 +49,42 @@ (click)='itemClicked(menuItem); $event.stopPropagation(); closeContextMenu()' (mouseover)="this.activeIndex=i; makeNavigable(); $event.stopPropagation();" > -
      -
      -
      {{menuItem.text}}
      -
      -
      -
      +
      +
      +
      +
      +
      {{menuItem.text}}
      +
      +
      +
      diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts index e002e3616..f52153e26 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts @@ -40,10 +40,13 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { newY: number; menuHeight: number; menuWidth: number; + _parentWidth: number; activeIndex: number; // Index of active item in menu. -1 if none active. _isChildMenu: boolean; // True if menu is child of another menu, false otherwise. _isParentActive: boolean; // True if parent item is active (ie. menu should be displayed), false otherwise. isNavigable: boolean; // True if menu is navigable, false otherwise. + _propagateChildLeft: boolean; + _propagateChildUp: boolean; _parentText: string; // Text of parent menu item children: { [key: string]: any }; @@ -69,11 +72,11 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { @ViewChildren(ContextMenuComponent) _children: QueryList; @Input() set xPos(xPos: number) { - this.newX = xPos + 2; + this.newX = xPos + 4; }; @Input() set yPos(yPos: number) { - this.newY = yPos + 4; + this.newY = yPos + 2; }; @Input() menuItems: ContextMenuItem[]; @@ -103,6 +106,19 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { @Input() set parentText(parentText: string) { this._parentText = parentText; }; + + @Input() set parentWidth(parentWidth: number) { + this._parentWidth = parentWidth; + }; + + // If parent propagated child left, child should also propagate its child left. + @Input() set propagateChildLeft(propagateChildLeft: boolean) { + this._propagateChildLeft = propagateChildLeft; + } + + @Input() set propagateChildUp(propagateChildUp: boolean) { + this._propagateChildUp = propagateChildUp; + } @@ -166,6 +182,7 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { let menuRight = xPos + menuWidth; let screenWidth = window.innerWidth - 10; /* Gave a 10 pixel buffer so isn't right on the edge */ if (menuRight > screenWidth) { + this._propagateChildLeft = true; let overshoot = menuLeft - screenWidth; xPos = xPos - (menuWidth + (overshoot > 0 ? overshoot : 0)) } @@ -181,8 +198,9 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { let menuBottom = yPos + menuHeight; let screenHeight = window.innerHeight - 10; /* Gave a 10 pixel buffer so isn't right on the edge */ if (menuBottom > screenHeight) { - let overshoot = menuTop - screenHeight; - yPos = yPos - (menuHeight + (overshoot > 0 ? overshoot : 0)); + this._propagateChildUp = true; + let overshoot = menuTop - screenHeight; + yPos = yPos - (menuHeight + (overshoot > 0 ? overshoot : 0)); } if (menuTop < 10) { let difference = 10 - menuTop; @@ -247,18 +265,35 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { this.activeIndex = mod(this.activeIndex + 1, this.menuItems.length) break; case 'ArrowRight': - if (hasChildren) { - this.makeUnnavigable(); // Make un-navigable because navigability will transfer to child menu - setTimeout(() => { - this.children[this.menuItems[this.activeIndex].text].makeNavigable(); - this.children[this.menuItems[this.activeIndex].text].setActiveIndex(0); - }, 0) + if (this._propagateChildLeft) { + if (this.isNavigable) { + this.makeParentNavigable.emit(); + this.setActiveIndex(-1); + } + } else { + if (hasChildren) { + this.makeUnnavigable(); // Make un-navigable because navigability will transfer to child menu + setTimeout(() => { + this.children[this.menuItems[this.activeIndex].text].makeNavigable(); + this.children[this.menuItems[this.activeIndex].text].setActiveIndex(0); + }, 0) + } } break; case 'ArrowLeft': - if (this.isNavigable) { - this.makeParentNavigable.emit(); - this.setActiveIndex(-1); + if (this._propagateChildLeft) { + if (hasChildren) { + this.makeUnnavigable(); // Make un-navigable because navigability will transfer to child menu + setTimeout(() => { + this.children[this.menuItems[this.activeIndex].text].makeNavigable(); + this.children[this.menuItems[this.activeIndex].text].setActiveIndex(0); + }, 0) + } + } else { + if (this.isNavigable) { + this.makeParentNavigable.emit(); + this.setActiveIndex(-1); + } } break; case 'Enter': From ff8d718b0e7bde7cb40f4026a3457dbce2d43480 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Tue, 24 Dec 2019 14:52:05 -0500 Subject: [PATCH 15/35] Add offset to parent menu to prevent menu from being automatically selected Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.html | 4 ++-- .../context-menu/context-menu.component.ts | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html index 9cc09605c..219d62e82 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html @@ -34,7 +34,7 @@
      -
      {{menuItem.text}}
      +
      {{this._isChildMenu == true}}
      {{menuItem.shortcut}}
      @@ -78,7 +78,7 @@ class="icon {{menuItem.icon}}" [class.propagateChildLeft]="this._propagateChildLeft" >
      -
      {{menuItem.text}}
      +
      {{this._isChildMenu == true}}
      ; @Input() set xPos(xPos: number) { - this.newX = xPos + 4; + this.newX = xPos + 2; }; @Input() set yPos(yPos: number) { - this.newY = yPos + 2; + this.newY = yPos + 4; }; @Input() menuItems: ContextMenuItem[]; From d134b29dd49e87195b111b35785e9e55244af73f Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Tue, 24 Dec 2019 14:56:16 -0500 Subject: [PATCH 16/35] Force submenus to have minimum width of 180px, same as parent menu Signed-off-by: Gabriel Keenleyside --- .../mvd-window-manager/context-menu/context-menu.component.css | 1 + 1 file changed, 1 insertion(+) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css index 8efdb6090..e0486a9ef 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css @@ -37,6 +37,7 @@ list-style: none; padding: 0; margin: 0; + width: 100%; } .context-menu .menu-item { From 1b9b4474a3ee314081c3122bfac21eaaa2e27345 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Tue, 24 Dec 2019 15:22:44 -0500 Subject: [PATCH 17/35] Add ability to disable menu items Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.css | 8 ++++++++ .../context-menu/context-menu.component.html | 16 ++++++++++++---- .../context-menu/context-menu.component.ts | 13 +++++++++++-- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css index e0486a9ef..039a214bc 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css @@ -10,6 +10,14 @@ Copyright Contributors to the Zowe Project. */ +li.disabled { + pointer-events: none; +} + +.menuitem-content.disabled { + opacity: 0.3; +} + .context-menu { position: absolute; /* margin-left: 2px; Offset menu so adjacent item is not automatically selected */ diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html index 219d62e82..5cdd05b22 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html @@ -28,13 +28,17 @@ [class.active]="i==this.activeIndex" [class.top]="i==0" [class.bottom]="i==menuItems.length-1" + [class.disabled]="menuItem.disabled" (click)='itemClicked(menuItem); $event.stopPropagation(); closeContextMenu()' (mouseover)="this.activeIndex=i; makeNavigable(); $event.stopPropagation();" > -
      +
      -
      {{this._isChildMenu == true}}
      +
      {{menuItem.text}}
      {{menuItem.shortcut}}
      @@ -46,6 +50,7 @@ [class.active]="i==this.activeIndex" [class.top]="i==0" [class.bottom]="i==menuItems.length-1" + [class.disabled]="menuItem.disabled" (click)='itemClicked(menuItem); $event.stopPropagation(); closeContextMenu()' (mouseover)="this.activeIndex=i; makeNavigable(); $event.stopPropagation();" > @@ -72,13 +77,16 @@ (sendRefToParent)="receiveRefFromChild($event)" >
      -
      +
      -
      {{this._isChildMenu == true}}
      +
      {{menuItem.text}}
      Date: Wed, 25 Dec 2019 02:36:07 -0500 Subject: [PATCH 18/35] Prevent disabled menu items from closing menu when clicked, and allow individual menu items to control whether clicking them causes the menu to close Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.html | 4 ++-- .../context-menu/context-menu.component.ts | 21 ++++--------------- .../src/pluginlib/inject-resources.ts | 3 ++- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html index 5cdd05b22..a21f0ec06 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html @@ -29,7 +29,7 @@ [class.top]="i==0" [class.bottom]="i==menuItems.length-1" [class.disabled]="menuItem.disabled" - (click)='itemClicked(menuItem); $event.stopPropagation(); closeContextMenu()' + (click)='itemClicked(menuItem); $event.stopPropagation();' (mouseover)="this.activeIndex=i; makeNavigable(); $event.stopPropagation();" >
      { this.complete.emit(); } @@ -227,20 +225,9 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { this.activeIndex = index; } - // @HostListener('document:mousedown', ['$event']) - // onMouseDown(event: MouseEvent): void { - // event.stopPropagation(); - // console.log("goodbye: ", this.menuItems[this.activeIndex]) - // setTimeout(() => { - // if (event && !this.elementRef.nativeElement.contains(event.target)) { - // this.closeContextMenu(); - // } - // }, 0) - // } - @HostListener('document:mousedown', ['$event']) onMouseDown(event: MouseEvent): void { - if (event && !this.elementRef.nativeElement.contains(event.target)) { + if (event && !this.elementRef.nativeElement.contains(event.target) && !this._isChildMenu) { this.closeContextMenu(); } } diff --git a/virtual-desktop/src/pluginlib/inject-resources.ts b/virtual-desktop/src/pluginlib/inject-resources.ts index f043400c5..727f64e2a 100644 --- a/virtual-desktop/src/pluginlib/inject-resources.ts +++ b/virtual-desktop/src/pluginlib/inject-resources.ts @@ -72,8 +72,9 @@ export interface ContextMenuItem { text: string; icon?: string; shortcut?: string; - action: () => void; + action: (closeContextMenu?: () => void) => void; children?: ContextMenuItem[]; + disabled?: boolean; } export interface Angular2L10nConfig { From c1822563ccf44ee932851c5f648bf6e1aec7e8e8 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Wed, 25 Dec 2019 03:04:51 -0500 Subject: [PATCH 19/35] Force menu item to expand to fit all contents when propagating left Signed-off-by: Gabriel Keenleyside --- .../mvd-window-manager/context-menu/context-menu.component.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css index 039a214bc..9740f4183 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css @@ -45,7 +45,7 @@ li.disabled { list-style: none; padding: 0; margin: 0; - width: 100%; + /* width: 100%; */ } .context-menu .menu-item { From 663bfaeec3af471a9af2aa0405f51caea02cb1a3 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Wed, 25 Dec 2019 03:09:40 -0500 Subject: [PATCH 20/35] Force parent menu to shift to the left by 3px when menu propagating left, so that cursor doesn't hover over menu when it spawns. Signed-off-by: Gabriel Keenleyside --- .../mvd-window-manager/context-menu/context-menu.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts index 608bd8bb7..bac91210f 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts @@ -59,7 +59,9 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { if (!this._isChildMenu) { this.newY = this.validateY(this.newY, menuHeight); this.newX = this.validateX(this.newX, menuWidth); - this.newX = this.newX + 3; + if (!this._propagateChildLeft) { + this.newX = this.newX + 3; + } } contextmenu.nativeElement.style.opacity = 1; this.menuHeight = menuHeight; From 48aba4c647f402e32f759447fe18ce4ae2ae3c31 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Wed, 25 Dec 2019 03:13:25 -0500 Subject: [PATCH 21/35] Update functionality for clicking Enter with menu item selected Signed-off-by: Gabriel Keenleyside --- .../mvd-window-manager/context-menu/context-menu.component.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts index bac91210f..975a7b622 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts @@ -297,9 +297,8 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { break; case 'Enter': if (this.menuItems[this.activeIndex].action) { - this.menuItems[this.activeIndex].action(); + this.menuItems[this.activeIndex].action(this.closeContextMenu); } - this.closeContextMenu(); } } } From b4f36eba358f8fd540ce3e4df3ea64074a3cca9c Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Wed, 25 Dec 2019 03:14:04 -0500 Subject: [PATCH 22/35] Remove unused BaseLogger object Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts index 975a7b622..bbbd67111 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts @@ -27,8 +27,6 @@ import { import { ContextMenuItem } from 'pluginlib/inject-resources'; -import { BaseLogger } from 'virtual-desktop-logger'; - @Component({ selector: 'com-rs-mvd-context-menu', templateUrl: './context-menu.component.html', @@ -133,11 +131,8 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { @Output() sendRefToParent = new EventEmitter(); - private readonly logger: ZLUX.ComponentLogger = BaseLogger; - constructor( private elementRef: ElementRef - //private logger: DesktopLogger ) { this.complete = new EventEmitter(); } @@ -213,7 +208,6 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { } itemClicked(menuItem: ContextMenuItem): void { - this.logger.info(menuItem.text); if (menuItem.action && !menuItem.disabled) { menuItem.action(this.closeContextMenu); } From d93e62c36d674188ab077a42bf24e1415663a597 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Wed, 25 Dec 2019 05:11:11 -0500 Subject: [PATCH 23/35] Allow user to trigger actions of visible menu items via their shortcuts if they exist Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.ts | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts index bbbd67111..290c5b045 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts @@ -221,6 +221,21 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { this.activeIndex = index; } + // getVisibleShortcuts = () => { + // let visibleShortcuts = []; + + // } + + // getVisibleShortcutsForMenu = (menu) => { + // let visibleShortCutsForMenu = []; + // this.menuItems.forEach(item => { + // if (item.shortcut) { + // visibleShortCutsForMenu.push(item.shortcut) + // } + + // }) + // } + @HostListener('document:mousedown', ['$event']) onMouseDown(event: MouseEvent): void { if (event && !this.elementRef.nativeElement.contains(event.target) && !this._isChildMenu) { @@ -240,6 +255,15 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { if (this.activeIndex > -1) { hasChildren = this.menuItems && this.menuItems[this.activeIndex].children ? true : false; } + if (this.elementRef.nativeElement.firstChild.scrollWidth > 0) { + this.menuItems.forEach(item => { + if (!item.disabled && item.shortcut) { + if (event.key === item.shortcut) { + item.action(this.closeContextMenu) + } + } + }) + } if (this.isNavigable) { let newIndex; switch (event.key){ @@ -293,6 +317,10 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { if (this.menuItems[this.activeIndex].action) { this.menuItems[this.activeIndex].action(this.closeContextMenu); } + break; + case 'Meta.k': + console.log("heloo") + break; } } } From 0da8bdd683d21a4f798fdaaa9c8a013262d84164 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Wed, 25 Dec 2019 05:20:08 -0500 Subject: [PATCH 24/35] Add menu item icon images Signed-off-by: Gabriel Keenleyside --- .../src/assets/images/contextmenu/person.png | Bin 0 -> 2013 bytes .../src/assets/images/contextmenu/settings.png | Bin 0 -> 2883 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 virtual-desktop/src/assets/images/contextmenu/person.png create mode 100644 virtual-desktop/src/assets/images/contextmenu/settings.png diff --git a/virtual-desktop/src/assets/images/contextmenu/person.png b/virtual-desktop/src/assets/images/contextmenu/person.png new file mode 100644 index 0000000000000000000000000000000000000000..99d63d7ce5947d68b8673f9e93b3a47134a727ac GIT binary patch literal 2013 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 R<2UnL%L)o(o@H>h{uepN!Dave literal 0 HcmV?d00001 From 13e24a9f77e681c5e47f4d2b33c13982dcde5929 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Wed, 25 Dec 2019 06:43:28 -0500 Subject: [PATCH 25/35] Clean up code and add additional comments Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.css | 20 ------ .../context-menu/context-menu.component.html | 5 -- .../context-menu/context-menu.component.ts | 72 +++++++------------ 3 files changed, 27 insertions(+), 70 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css index 9740f4183..5045798dc 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css @@ -20,7 +20,6 @@ li.disabled { .context-menu { position: absolute; - /* margin-left: 2px; Offset menu so adjacent item is not automatically selected */ z-index: 20000; min-width: 180px; width: auto; @@ -41,11 +40,9 @@ li.disabled { } .context-menu>ul { - /* background-color:#eaeaea; */ list-style: none; padding: 0; margin: 0; - /* width: 100%; */ } .context-menu .menu-item { @@ -96,10 +93,7 @@ li.disabled { } .context-menu .multi-menu-item>.submenu { - /* propagate right */ right: 0px; - /* propagate left */ - /* left: 0px; */ top: 0; position: absolute; display: none; @@ -110,20 +104,6 @@ li.disabled { left: 0px; } -.test { - width: 20px; - height: 20px; - border: 1px solid blue; -} - -/* .context-menu .multi-menu-item>.submenu .propagateChildLeft { - right: 50px; -} - -.context-menu .multi-menu-item>.submenu .propagateChildUp { - top: 50px; -} */ - .context-menu .multi-menu-item>.submenu>com-rs-mvd-context-menu>.context-menu { left: 0; top: 0; diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html index a21f0ec06..d4ef2c6ab 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html @@ -16,7 +16,6 @@ [style.left.px]='this.newX' [style.top.px]='this.newY' [class.propagateChildLeft]="this._propagateChildLeft" - [class.propagateChildUp]="this._propagateChildUp" [class.navigable]='this.isNavigable' >
        @@ -57,10 +56,8 @@
        { let menuHeight = contextmenu.nativeElement.clientHeight; let menuWidth = contextmenu.nativeElement.clientWidth; + // Apply specific styling to parent menu, and to parent menu that will propagate children to the left. if (!this._isChildMenu) { this.newY = this.validateY(this.newY, menuHeight); this.newX = this.validateX(this.newX, menuWidth); @@ -72,14 +69,17 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { @ViewChildren(ContextMenuComponent) _children: QueryList; + // Set initial horizontal position of menu @Input() set xPos(xPos: number) { this.newX = xPos + 2; }; + // Set initial vertical position of menu @Input() set yPos(yPos: number) { this.newY = yPos + 4; }; + // Initialize array of menu items @Input() menuItems: ContextMenuItem[]; // Declare value of _isChildMenu based on input isChildMenu @@ -104,24 +104,15 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { } }; + // Set value of parentText based on input @Input() set parentText(parentText: string) { this._parentText = parentText; }; - - @Input() set parentWidth(parentWidth: number) { - this._parentWidth = parentWidth; - }; // If parent propagated child left, child should also propagate its child left. @Input() set propagateChildLeft(propagateChildLeft: boolean) { this._propagateChildLeft = propagateChildLeft; } - - @Input() set propagateChildUp(propagateChildUp: boolean) { - this._propagateChildUp = propagateChildUp; - } - - @Output() complete: EventEmitter; @@ -158,13 +149,8 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { this.makeParentUnnavigable.emit() } } - - ngOnInit() { - } - - ngOnDestroy() { - } + // After child elements retrieved from DOM, convert from array to object for faster access ngAfterViewInit() { this.elementRef.nativeElement.focus() this.children = this._children.toArray().reduce((acc, curr) => ( @@ -175,15 +161,18 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { ), {}) } + // Recalculate horizontal position at which to spawn menu, correcting for proximity to edges of screen validateX(xPos: number, menuWidth: number): number { let menuLeft = xPos; let menuRight = xPos + menuWidth; - let screenWidth = window.innerWidth - 10; /* Gave a 10 pixel buffer so isn't right on the edge */ + let screenWidth = window.innerWidth - 10; /* Give a 10 pixel buffer so isn't right on the edge */ + // If initial position or menu too close to right edge of screen, shift left until right edge of menu is at least 10px from right edge of screen if (menuRight > screenWidth) { this._propagateChildLeft = true; let overshoot = menuLeft - screenWidth; xPos = xPos - (menuWidth + (overshoot > 0 ? overshoot : 0)) } + // If initial position or menu too close to left edge of screen, shift right until left edge of menu is at least 10px from left edge of screen if (menuLeft < 10) { let difference = 10 - menuLeft; xPos = xPos + difference; @@ -191,15 +180,17 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { return xPos; } + // Recalculate vertical position at which to spawn menu, correcting for proximity to edges of screen validateY(yPos: number, menuHeight: number): number { let menuTop = yPos; let menuBottom = yPos + menuHeight; - let screenHeight = window.innerHeight - 10; /* Gave a 10 pixel buffer so isn't right on the edge */ + let screenHeight = window.innerHeight - 10; /* Give a 10 pixel buffer so isn't right on the edge */ + // If initial position of menu too close to bottom of screen, shift left until bottom edge of menu is at least 10px from bottom of screen if (menuBottom > screenHeight) { - this._propagateChildUp = true; let overshoot = menuTop - screenHeight; yPos = yPos - (menuHeight + (overshoot > 0 ? overshoot : 0)); } + // If initial position of menu too close to top of screen, shift left until top edge of menu is at least 10px from top of screen if (menuTop < 10) { let difference = 10 - menuTop; yPos = yPos + difference; @@ -207,35 +198,25 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { return yPos; } + // Triggered when menu item clicked. + // If item has associated action and is not disabled, execute action itemClicked(menuItem: ContextMenuItem): void { if (menuItem.action && !menuItem.disabled) { menuItem.action(this.closeContextMenu); } } + // Close context menu closeContextMenu = (): void => { this.complete.emit(); } + // Set active index setActiveIndex = (index: number) => { this.activeIndex = index; } - // getVisibleShortcuts = () => { - // let visibleShortcuts = []; - - // } - - // getVisibleShortcutsForMenu = (menu) => { - // let visibleShortCutsForMenu = []; - // this.menuItems.forEach(item => { - // if (item.shortcut) { - // visibleShortCutsForMenu.push(item.shortcut) - // } - - // }) - // } - + // When area of screen outside of menu is clicked, close menu @HostListener('document:mousedown', ['$event']) onMouseDown(event: MouseEvent): void { if (event && !this.elementRef.nativeElement.contains(event.target) && !this._isChildMenu) { @@ -243,11 +224,13 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { } } + // When window resized, close menu @HostListener('window:resize') onResize(): void { this.closeContextMenu(); } + // Handle key presses that occur while context menu is open @HostListener('window:keydown', ['$event']) onWindowKeyDown(event: KeyboardEvent) { let mod = (x: number, n: number): number => ((x == -2 ? -1 : x % n) + n) % n; @@ -255,6 +238,7 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { if (this.activeIndex > -1) { hasChildren = this.menuItems && this.menuItems[this.activeIndex].children ? true : false; } + // Execute action of any visible item whose shortcut has been pressed if (this.elementRef.nativeElement.firstChild.scrollWidth > 0) { this.menuItems.forEach(item => { if (!item.disabled && item.shortcut) { @@ -264,6 +248,7 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { } }) } + // Perform navigation of navigable menu if (this.isNavigable) { let newIndex; switch (event.key){ @@ -318,9 +303,6 @@ export class ContextMenuComponent implements AfterViewInit, OnInit, OnDestroy { this.menuItems[this.activeIndex].action(this.closeContextMenu); } break; - case 'Meta.k': - console.log("heloo") - break; } } } From 9c5af43cd84285fc5e7ffc1780d34a13c2e550b1 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Fri, 27 Dec 2019 01:09:50 -0500 Subject: [PATCH 26/35] Change behavior of menu items such that their default behavior is to close the context menu when clicked, and will not do so only if the 'menuItem.preventCloseMenu' field is set to true Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.ts | 9 ++++++--- virtual-desktop/src/pluginlib/inject-resources.ts | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts index 7ba5b41a0..f3cb5f37f 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts @@ -202,7 +202,10 @@ export class ContextMenuComponent implements AfterViewInit { // If item has associated action and is not disabled, execute action itemClicked(menuItem: ContextMenuItem): void { if (menuItem.action && !menuItem.disabled) { - menuItem.action(this.closeContextMenu); + menuItem.action(); + } + if (!menuItem.preventCloseMenu) { + this.closeContextMenu(); } } @@ -243,7 +246,7 @@ export class ContextMenuComponent implements AfterViewInit { this.menuItems.forEach(item => { if (!item.disabled && item.shortcut) { if (event.key === item.shortcut) { - item.action(this.closeContextMenu) + item.action() } } }) @@ -300,7 +303,7 @@ export class ContextMenuComponent implements AfterViewInit { break; case 'Enter': if (this.menuItems[this.activeIndex].action) { - this.menuItems[this.activeIndex].action(this.closeContextMenu); + this.menuItems[this.activeIndex].action(); } break; } diff --git a/virtual-desktop/src/pluginlib/inject-resources.ts b/virtual-desktop/src/pluginlib/inject-resources.ts index 727f64e2a..9e2145be5 100644 --- a/virtual-desktop/src/pluginlib/inject-resources.ts +++ b/virtual-desktop/src/pluginlib/inject-resources.ts @@ -72,9 +72,10 @@ export interface ContextMenuItem { text: string; icon?: string; shortcut?: string; - action: (closeContextMenu?: () => void) => void; + action: () => void; children?: ContextMenuItem[]; disabled?: boolean; + preventCloseMenu?: boolean; } export interface Angular2L10nConfig { From 4b082b584a2fe2e95863db11a59bc5d625803c47 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Fri, 27 Dec 2019 23:39:29 -0500 Subject: [PATCH 27/35] Allow context menu item shortcuts to include modifiers, and prevent default behavior of these key+modifer(s) Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.html | 4 +- .../context-menu/context-menu.component.ts | 38 +++++++++++++++++-- .../src/pluginlib/inject-resources.ts | 10 ++++- 3 files changed, 46 insertions(+), 6 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html index d4ef2c6ab..0030af789 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html @@ -39,7 +39,9 @@
        {{menuItem.text}}
        -
        {{menuItem.shortcut}}
        +
        + {{this.computeShortcutString(menuItem)}} +
      diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts index f3cb5f37f..a6fbfba59 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts @@ -219,6 +219,35 @@ export class ContextMenuComponent implements AfterViewInit { this.activeIndex = index; } + computeShortcutString = (item: ContextMenuItem) => { + let shortcutString = ""; + if (item.shortcutProps) { + let props = item.shortcutProps; + if (props.altKey) { + shortcutString += "Alt "; + } + if (props.ctrlKey) { + shortcutString += "Ctrl "; + } + if (props.metaKey) { + shortcutString += "Cmd "; + } + if (props.shiftKey) { + shortcutString += "Shift "; + } + } + shortcutString += item.shortcutText; + return shortcutString; + } + + shortcutProps?: { + "code": string; + "altKey": boolean; + "ctrlKey": boolean; + "metaKey": boolean; + "shiftKey": boolean; + }; + // When area of screen outside of menu is clicked, close menu @HostListener('document:mousedown', ['$event']) onMouseDown(event: MouseEvent): void { @@ -236,6 +265,7 @@ export class ContextMenuComponent implements AfterViewInit { // Handle key presses that occur while context menu is open @HostListener('window:keydown', ['$event']) onWindowKeyDown(event: KeyboardEvent) { + // console.log(event) let mod = (x: number, n: number): number => ((x == -2 ? -1 : x % n) + n) % n; let hasChildren; if (this.activeIndex > -1) { @@ -244,9 +274,11 @@ export class ContextMenuComponent implements AfterViewInit { // Execute action of any visible item whose shortcut has been pressed if (this.elementRef.nativeElement.firstChild.scrollWidth > 0) { this.menuItems.forEach(item => { - if (!item.disabled && item.shortcut) { - if (event.key === item.shortcut) { - item.action() + if (!item.disabled && item.shortcutProps) { + // If all properties of shortcut associated with given item match those of key(s) clicked, execute action associated with item. + if (Object.keys(item.shortcutProps).every(shortcutProp => ((event)[shortcutProp] === (item.shortcutProps)[shortcutProp]))){ + item.action(); + event.preventDefault(); } } }) diff --git a/virtual-desktop/src/pluginlib/inject-resources.ts b/virtual-desktop/src/pluginlib/inject-resources.ts index 9e2145be5..7d5b8ddfc 100644 --- a/virtual-desktop/src/pluginlib/inject-resources.ts +++ b/virtual-desktop/src/pluginlib/inject-resources.ts @@ -71,7 +71,14 @@ export interface Angular2PluginEmbedActions { export interface ContextMenuItem { text: string; icon?: string; - shortcut?: string; + shortcutText?: string; + shortcutProps?: { + "code": string; + "altKey": boolean; + "ctrlKey": boolean; + "metaKey": boolean; + "shiftKey": boolean; + }; action: () => void; children?: ContextMenuItem[]; disabled?: boolean; @@ -83,7 +90,6 @@ export interface Angular2L10nConfig { readonly providers: any[]; } - /* This program and the accompanying materials are made available under the terms of the Eclipse Public License v2.0 which accompanies From b80ba5fd7f2ad8b3e09308c53dcb20ad64a0e8f7 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Fri, 27 Dec 2019 23:49:41 -0500 Subject: [PATCH 28/35] Add functionality to close context menu by default when item action is executed by clicking Enter or with keyboard shortcut. Previously, closing the context menu was default only for clicking the item. Retain ability for item to NOT close context menu when action is executed via Enter or shortcut, if property preventCloseMenu is true Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts index a6fbfba59..347a45aaa 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts @@ -277,8 +277,11 @@ export class ContextMenuComponent implements AfterViewInit { if (!item.disabled && item.shortcutProps) { // If all properties of shortcut associated with given item match those of key(s) clicked, execute action associated with item. if (Object.keys(item.shortcutProps).every(shortcutProp => ((event)[shortcutProp] === (item.shortcutProps)[shortcutProp]))){ - item.action(); event.preventDefault(); + item.action(); + if (!item.preventCloseMenu) { + this.closeContextMenu(); + } } } }) @@ -334,8 +337,12 @@ export class ContextMenuComponent implements AfterViewInit { } break; case 'Enter': - if (this.menuItems[this.activeIndex].action) { - this.menuItems[this.activeIndex].action(); + let item = this.menuItems[this.activeIndex]; + if (item.action) { + item.action(); + } + if (!item.preventCloseMenu) { + this.closeContextMenu(); } break; } From b57a7613bab6cdad7dac6159c886a4667d0fcc39 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Sat, 28 Dec 2019 00:02:38 -0500 Subject: [PATCH 29/35] Fix bug where non-parent menu items with no shortcuts display 'undefined' where shortcut would be Signed-off-by: Gabriel Keenleyside --- .../mvd-window-manager/context-menu/context-menu.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts index 347a45aaa..8326abece 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts @@ -236,7 +236,9 @@ export class ContextMenuComponent implements AfterViewInit { shortcutString += "Shift "; } } - shortcutString += item.shortcutText; + if (item.shortcutText) { + shortcutString += item.shortcutText; + } return shortcutString; } From b28b03d65031f2b96977cede94f176f4027f9471 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Mon, 30 Dec 2019 01:18:55 -0100 Subject: [PATCH 30/35] Prevent left/right arrows from triggering any action if item has no children Signed-off-by: Gabriel Keenleyside --- .../mvd-window-manager/context-menu/context-menu.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts index 8326abece..6e1d50057 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.ts @@ -308,7 +308,7 @@ export class ContextMenuComponent implements AfterViewInit { break; case 'ArrowRight': if (this._propagateChildLeft) { - if (this.isNavigable) { + if (this.isNavigable && this._isChildMenu) { this.makeParentNavigable.emit(); this.setActiveIndex(-1); } @@ -332,7 +332,7 @@ export class ContextMenuComponent implements AfterViewInit { }, 0) } } else { - if (this.isNavigable) { + if (this.isNavigable && this._isChildMenu) { this.makeParentNavigable.emit(); this.setActiveIndex(-1); } From 35b581a1ba8b74895a9ecda6d4f4b24316409ab4 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Mon, 30 Dec 2019 02:46:04 -0100 Subject: [PATCH 31/35] Generate context menu item icon images from Base64 string references rather than from stylesheet Signed-off-by: Gabriel Keenleyside --- .../context-menu/context-menu.component.css | 12 ++++-------- .../context-menu/context-menu.component.html | 14 ++++++++++---- .../context-menu/context-menu.component.ts | 8 +++++++- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css index 5045798dc..022c17d29 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css @@ -135,20 +135,16 @@ li.disabled { margin-left: 25px; } -.icon-person { - background-image: url(../../../../assets/images/contextmenu/person.png); -} - -.icon-settings { - background-image: url(../../../../assets/images/contextmenu/settings.png); -} - .shortcut { margin-left: 15px; right: 5px; font-weight: bold; } +.hide-icon { + display: none; +} + /* This program and the accompanying materials are made available under the terms of the Eclipse Public License v2.0 which accompanies diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html index 0030af789..f8889f845 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.html @@ -36,7 +36,11 @@ [class.disabled]="menuItem.disabled" >
      -
      +
      {{menuItem.text}}
      @@ -79,10 +83,12 @@ [class.disabled]="menuItem.disabled" >
      -
      + >
      {{menuItem.text}}
      (); } @@ -242,6 +244,10 @@ export class ContextMenuComponent implements AfterViewInit { return shortcutString; } + generateIcon = (base64Image: string) => { + return this.sanitizer.bypassSecurityTrustResourceUrl(base64Image); + } + shortcutProps?: { "code": string; "altKey": boolean; From 879b2430b825c49a224a05f22c4cef07b6961b02 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Mon, 30 Dec 2019 02:54:13 -0100 Subject: [PATCH 32/35] Remove image files used in previous implementation of context menu item icon images with CSS Signed-off-by: Gabriel Keenleyside --- .../src/assets/images/contextmenu/person.png | Bin 2013 -> 0 bytes .../src/assets/images/contextmenu/settings.png | Bin 2883 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 virtual-desktop/src/assets/images/contextmenu/person.png delete mode 100644 virtual-desktop/src/assets/images/contextmenu/settings.png diff --git a/virtual-desktop/src/assets/images/contextmenu/person.png b/virtual-desktop/src/assets/images/contextmenu/person.png deleted file mode 100644 index 99d63d7ce5947d68b8673f9e93b3a47134a727ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2013 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 R<2UnL%L)o(o@H>h{uepN!Dave From bd933226a2a367027eb433da239193c71f137ff0 Mon Sep 17 00:00:00 2001 From: Gabriel Keenleyside Date: Mon, 30 Dec 2019 02:56:42 -0100 Subject: [PATCH 33/35] Revert changes made to context-utils file used for testing, containing context menu item data for launchbar context menus Signed-off-by: Gabriel Keenleyside --- .../mvd-window-manager/launchbar/shared/context-utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/shared/context-utils.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/shared/context-utils.ts index 121baf5e5..d0b8c58a9 100644 --- a/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/shared/context-utils.ts +++ b/virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/shared/context-utils.ts @@ -112,4 +112,4 @@ export function generateInstanceActions(item: LaunchbarItem, ] } return menuItems; -} +} \ No newline at end of file From ffd6f4e861e0bba9c9f2be8cba13fd34d2218b03 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 10 Jan 2020 12:46:17 -0500 Subject: [PATCH 34/35] Use https instead of git for read-only references Signed-off-by: 1000TurquoisePogs --- .../system-settings-preferences/webClient/package-lock.json | 4 ++-- .../system-settings-preferences/webClient/package.json | 2 +- virtual-desktop/package-lock.json | 4 ++-- virtual-desktop/package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/system-apps/system-settings-preferences/webClient/package-lock.json b/system-apps/system-settings-preferences/webClient/package-lock.json index 54831f7d9..f99127946 100644 --- a/system-apps/system-settings-preferences/webClient/package-lock.json +++ b/system-apps/system-settings-preferences/webClient/package-lock.json @@ -796,8 +796,8 @@ } }, "@zlux/widgets": { - "version": "git+ssh://git@github.com/zowe/zlux-widgets.git#4b988b7614cb3c4cd7b5cae264d62cb270bb3bd1", - "from": "git+ssh://git@github.com/zowe/zlux-widgets.git", + "version": "git+https://github.com/zowe/zlux-widgets.git#4b988b7614cb3c4cd7b5cae264d62cb270bb3bd1", + "from": "git+https://github.com/zowe/zlux-widgets.git", "dev": true, "requires": { "@angular/animations": "~6.0.9", diff --git a/system-apps/system-settings-preferences/webClient/package.json b/system-apps/system-settings-preferences/webClient/package.json index 58db93732..9603a8683 100644 --- a/system-apps/system-settings-preferences/webClient/package.json +++ b/system-apps/system-settings-preferences/webClient/package.json @@ -24,7 +24,7 @@ "@angular/platform-browser-dynamic": "~6.0.9", "@angular/router": "~6.0.9", "angular-l10n": "~5.2.0", - "@zlux/widgets": "git+ssh://git@github.com:zowe/zlux-widgets.git", + "@zlux/widgets": "git+https://github.com:zowe/zlux-widgets.git", "angular2-template-loader": "~0.6.2", "codelyzer": "~4.4.2", "copy-webpack-plugin": "~4.5.2", diff --git a/virtual-desktop/package-lock.json b/virtual-desktop/package-lock.json index f45db32b8..0f2129168 100644 --- a/virtual-desktop/package-lock.json +++ b/virtual-desktop/package-lock.json @@ -335,8 +335,8 @@ "dev": true }, "@zlux/widgets": { - "version": "git+ssh://git@github.com/zowe/zlux-widgets.git#da92205dedda0ed45ab69cfa098808bedd765221", - "from": "git+ssh://git@github.com/zowe/zlux-widgets.git", + "version": "git+https://github.com/zowe/zlux-widgets.git#da92205dedda0ed45ab69cfa098808bedd765221", + "from": "git+https://github.com/zowe/zlux-widgets.git", "dev": true, "requires": { "@angular/animations": "~6.0.9", diff --git a/virtual-desktop/package.json b/virtual-desktop/package.json index d005c7e39..b06b9c603 100644 --- a/virtual-desktop/package.json +++ b/virtual-desktop/package.json @@ -24,7 +24,7 @@ "@angular/platform-browser-dynamic": "~6.0.9", "@angular/router": "~6.0.9", "@types/html2canvas": "~0.0.35", - "@zlux/widgets": "git+ssh://git@github.com/zowe/zlux-widgets.git", + "@zlux/widgets": "git+https://github.com/zowe/zlux-widgets.git", "angular-l10n": "~5.2.0", "angular2-template-loader": "~0.6.2", "bootstrap": "~4.3.1", From 8ee7044ff5dcc6436747265f0547a89168c056e0 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 14 Jan 2020 17:05:05 -0500 Subject: [PATCH 35/35] Make it so that expiration does not close windows, so you do not lose your work Signed-off-by: 1000TurquoisePogs --- .../authentication-manager.service.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/virtual-desktop/src/app/authentication-manager/authentication-manager.service.ts b/virtual-desktop/src/app/authentication-manager/authentication-manager.service.ts index eb1654e2e..a0732ffe5 100644 --- a/virtual-desktop/src/app/authentication-manager/authentication-manager.service.ts +++ b/virtual-desktop/src/app/authentication-manager/authentication-manager.service.ts @@ -133,10 +133,12 @@ export class AuthenticationManager { //requestLogin() used to exist here but it was counter-intuitive in behavior to requestLogout. //This was not documented and therefore has been removed to prevent misuse and confusion. - private doLoggoutInner(reason: LoginScreenChangeReason): void { + private doLogoutInner(reason: LoginScreenChangeReason): void { const windowManager: MVDWindowManagement.WindowManagerServiceInterface = this.injector.get(MVDWindowManagement.Tokens.WindowManagerToken); - windowManager.closeAllWindows(); + if (reason == LoginScreenChangeReason.UserLogout) { + windowManager.closeAllWindows(); + } this.performLogout().subscribe( response => { this.loginScreenVisibilityChanged.emit(reason); @@ -149,7 +151,7 @@ export class AuthenticationManager { } requestLogout(): void { - this.doLoggoutInner(LoginScreenChangeReason.UserLogout); + this.doLogoutInner(LoginScreenChangeReason.UserLogout); } private performPostLoginActions(): Observable { @@ -216,7 +218,7 @@ export class AuthenticationManager { expirationInMS: logoutAfterWarnTimer}); this.expirationWarning = setTimeout(()=> { this.log.warn(`Session timeout reached. Clearing desktop for new login.`); - this.doLoggoutInner(LoginScreenChangeReason.SessionExpired); + this.doLogoutInner(LoginScreenChangeReason.SessionExpired); },logoutAfterWarnTimer); },warnTimer); this.log.debug(`Set session timeout watcher to notify ${warnTimer}ms before expiration`);