From 57a19bfa7309710628815ecbc596a4f46baa1b0f Mon Sep 17 00:00:00 2001 From: chinonso098 Date: Thu, 5 Sep 2024 14:25:11 -0400 Subject: [PATCH] Went off on a tangent --- src/Things to do.txt | 2 +- .../system-apps/desktop/desktop.component.css | 3 ++- .../system-apps/taskbar/taskbar.component.css | 2 +- .../system-apps/taskbar/taskbar.component.ts | 23 +++++++++++++++---- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/Things to do.txt b/src/Things to do.txt index 0ee60a6a..26ca3db5 100644 --- a/src/Things to do.txt +++ b/src/Things to do.txt @@ -81,7 +81,7 @@ sudo n lts| stable | latest --(pick one) 32.) Aligon icond to grid on the desktop is broken -33.) Windows z-indexing is BROOOOKEN. +33.) Windows z-indexing is BROOOOKEN -- done. 34.) Creating a new folder from the termial/fileexplorer has broken back navigation diff --git a/src/app/system-apps/desktop/desktop.component.css b/src/app/system-apps/desktop/desktop.component.css index 4fcdb6b5..6ed1bde3 100644 --- a/src/app/system-apps/desktop/desktop.component.css +++ b/src/app/system-apps/desktop/desktop.component.css @@ -7,7 +7,8 @@ right: 0; top: 0; bottom: 0; - background-color: blue; + /* background-color: blue; */ + background-color: #208c71; /*Windows 95 Green*/ } .dsktp-screen-preview-container{ diff --git a/src/app/system-apps/taskbar/taskbar.component.css b/src/app/system-apps/taskbar/taskbar.component.css index a2801913..b07c015d 100644 --- a/src/app/system-apps/taskbar/taskbar.component.css +++ b/src/app/system-apps/taskbar/taskbar.component.css @@ -7,5 +7,5 @@ position: fixed; right: 0; width: 100vw; - z-index: 10000; + z-index: 5; } \ No newline at end of file diff --git a/src/app/system-apps/taskbar/taskbar.component.ts b/src/app/system-apps/taskbar/taskbar.component.ts index 87d3cb0a..6ea3bb2a 100644 --- a/src/app/system-apps/taskbar/taskbar.component.ts +++ b/src/app/system-apps/taskbar/taskbar.component.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component, ElementRef, AfterViewInit } from '@angular/core'; import { MenuService } from 'src/app/shared/system-service/menu.services'; import { ProcessIDService } from 'src/app/shared/system-service/process.id.service'; import { RunningProcessService } from 'src/app/shared/system-service/running.process.service'; @@ -10,12 +10,13 @@ import { Process } from 'src/app/system-files/process'; templateUrl: './taskbar.component.html', styleUrls: ['./taskbar.component.css'] }) -export class TaskbarComponent { +export class TaskbarComponent implements AfterViewInit{ private _processIdService:ProcessIDService; private _runningProcessService:RunningProcessService; private _menuService:MenuService; - + private _el: ElementRef; + SECONDS_DELAY = 1000; hasWindow = false; icon = 'osdrive/icons/generic-program.ico'; @@ -24,15 +25,29 @@ export class TaskbarComponent { type = ComponentType.System displayName = '' - constructor( processIdService:ProcessIDService,runningProcessService:RunningProcessService, menuService:MenuService) { + constructor( processIdService:ProcessIDService,runningProcessService:RunningProcessService, menuService:MenuService, el: ElementRef) { this._processIdService = processIdService; this._runningProcessService = runningProcessService; this._menuService = menuService; + this._el = el; + this.processId = this._processIdService.getNewProcessId() this._runningProcessService.addProcess(this.getComponentDetail()); } + ngAfterViewInit(): void { + + // VANTA js wallpaper is adding an unwanted style position:relative and z-index:1 + setTimeout(()=> { + const tskBar = this._el.nativeElement; + if(tskBar) { + tskBar.style.position = ''; + tskBar.style.zIndex = ''; + } + }, this.SECONDS_DELAY); + } + hideContextMenus():void{ this._menuService.hideContextMenus.next(); }