From dc60d1254b3e9cafbfe5fc47dec2c98cb0b5c071 Mon Sep 17 00:00:00 2001
From: Sean Engelhardt <sean.f.t.engelhardt@gmail.com>
Date: Tue, 24 Sep 2019 21:31:51 +0200
Subject: [PATCH] Fix flickering projector button in lists

...
---
 .../projector-button/projector-button.component.html | 12 ++++++------
 .../projector-button/projector-button.component.ts   | 10 +---------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/client/src/app/shared/components/projector-button/projector-button.component.html b/client/src/app/shared/components/projector-button/projector-button.component.html
index 132fa5c81..6c00fdb7e 100644
--- a/client/src/app/shared/components/projector-button/projector-button.component.html
+++ b/client/src/app/shared/components/projector-button/projector-button.component.html
@@ -1,19 +1,19 @@
 <ng-container *osPerms="'core.can_manage_projector'">
     <button
         type="button"
-        *ngIf="!text && !menuItem"
+        class="projector-active"
         mat-mini-fab
         (click)="onClick($event)"
-        [ngClass]="isProjected ? 'projector-active' : 'projector-inactive'"
+        *ngIf="!text && !menuItem && checkIsProjected()"
     >
         <mat-icon>videocam</mat-icon>
     </button>
     <button
         type="button"
-        *ngIf="text && !menuItem"
-        mat-button
+        class="projector-inactive"
+        mat-mini-fab
         (click)="onClick($event)"
-        [ngClass]="isProjected ? 'projector-active' : 'projector-inactive'"
+        *ngIf="!text && !menuItem && !checkIsProjected()"
     >
         <mat-icon>videocam</mat-icon>
         {{ text | translate }}
@@ -23,7 +23,7 @@
         *ngIf="menuItem"
         mat-menu-item
         (click)="onClick()"
-        [ngClass]="isProjected ? 'projector-active' : 'projector-inactive'"
+        [ngClass]="checkIsProjected() ? 'projector-active' : 'projector-inactive'"
     >
         <mat-icon>videocam</mat-icon>
         {{ text || 'Project' | translate }}
diff --git a/client/src/app/shared/components/projector-button/projector-button.component.ts b/client/src/app/shared/components/projector-button/projector-button.component.ts
index 4a81beb25..bfcb24719 100644
--- a/client/src/app/shared/components/projector-button/projector-button.component.ts
+++ b/client/src/app/shared/components/projector-button/projector-button.component.ts
@@ -37,8 +37,6 @@ export class ProjectorButtonComponent implements OnInit, OnDestroy {
         return this._object;
     }
 
-    public isProjected = false;
-
     @Input()
     public set object(obj: Projectable | ProjectorElementBuildDeskriptor) {
         if (isProjectable(obj) || isProjectorElementBuildDeskriptor(obj)) {
@@ -78,17 +76,11 @@ export class ProjectorButtonComponent implements OnInit, OnDestroy {
      * Initialization function
      */
     public ngOnInit(): void {
-        this.isProjected = this.checkIsProjected();
-
         this.projectorRepoSub = this.projectorRepo
             .getGeneralViewModelObservable()
             .pipe(distinctUntilChanged())
             .subscribe(() => {
-                const isProjected = this.checkIsProjected();
-                if (this.isProjected !== isProjected) {
-                    this.isProjected = isProjected;
-                    this.changeEvent.next();
-                }
+                this.changeEvent.next();
             });
     }