From 6fdd2de3c0675321ffafc8fc9824e06b067afd22 Mon Sep 17 00:00:00 2001
From: GabrielMeyer <meyergabriel@live.de>
Date: Tue, 30 Jul 2019 14:24:50 +0200
Subject: [PATCH] Updates the projector

- The height is resetting by changing the slide.
- The user does not see a 'moving'-cursor by hovering over the projector-icon in the queue.
---
 .../projector-detail.component.html           | 26 ++++++++++++++-----
 .../projector-detail.component.scss           |  4 +++
 openslides/core/views.py                      |  1 +
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/client/src/app/site/projector/components/projector-detail/projector-detail.component.html b/client/src/app/site/projector/components/projector-detail/projector-detail.component.html
index 66654506e..f8e173fb8 100644
--- a/client/src/app/site/projector/components/projector-detail/projector-detail.component.html
+++ b/client/src/app/site/projector/components/projector-detail/projector-detail.component.html
@@ -142,7 +142,7 @@
                             <div class="drag-handle" cdkDragHandle *ngIf="editQueue">
                                 <mat-icon>drag_indicator</mat-icon>
                             </div>
-                            <div class="drag-handle" *ngIf="!editQueue">
+                            <div class="drag-handle no-drag" *ngIf="!editQueue">
                                 <button type="button" mat-icon-button (click)="projectNow(i)">
                                     <mat-icon>videocam</mat-icon>
                                 </button>
@@ -235,7 +235,12 @@
                     <!-- Slide-->
                     <mat-list *ngIf="projectorCount > 1">
                         <mat-list-item>
-                            <button type="button" mat-mini-fab (click)="toggleClos(false)" [ngClass]="isClosProjected(false) ? 'projector-active' : 'projector-inactive'">
+                            <button
+                                type="button"
+                                mat-mini-fab
+                                (click)="toggleClos(false)"
+                                [ngClass]="isClosProjected(false) ? 'projector-active' : 'projector-inactive'"
+                            >
                                 <mat-icon>videocam</mat-icon>
                             </button>
                             <span class="spacer-left-10" translate>Slide</span>
@@ -245,7 +250,12 @@
                     <!-- Overlay -->
                     <mat-list>
                         <mat-list-item>
-                            <button type="button" mat-mini-fab (click)="toggleClos(true)" [ngClass]="isClosProjected(true) ? 'projector-active' : 'projector-inactive'">
+                            <button
+                                type="button"
+                                mat-mini-fab
+                                (click)="toggleClos(true)"
+                                [ngClass]="isClosProjected(true) ? 'projector-active' : 'projector-inactive'"
+                            >
                                 <mat-icon>videocam</mat-icon>
                             </button>
                             <span class="spacer-left-10" translate>Overlay</span>
@@ -255,7 +265,12 @@
                     <!-- Chyron -->
                     <mat-list>
                         <mat-list-item>
-                            <button type="button" mat-mini-fab (click)="toggleChyron()" [ngClass]="isChyronProjected() ? 'projector-active' : 'projector-inactive'">
+                            <button
+                                type="button"
+                                mat-mini-fab
+                                (click)="toggleChyron()"
+                                [ngClass]="isChyronProjected() ? 'projector-active' : 'projector-inactive'"
+                            >
                                 <mat-icon>videocam</mat-icon>
                             </button>
                             <span class="spacer-left-10" translate>Chyron</span>
@@ -272,8 +287,7 @@
                     </os-presentation-control>
                 </mat-expansion-panel>-->
 
-                <os-presentation-control [projector]="projector">
-                </os-presentation-control>
+                <os-presentation-control [projector]="projector"> </os-presentation-control>
             </mat-accordion>
         </div>
     </div>
diff --git a/client/src/app/site/projector/components/projector-detail/projector-detail.component.scss b/client/src/app/site/projector/components/projector-detail/projector-detail.component.scss
index 3a618c130..61ff7d595 100644
--- a/client/src/app/site/projector/components/projector-detail/projector-detail.component.scss
+++ b/client/src/app/site/projector/components/projector-detail/projector-detail.component.scss
@@ -93,6 +93,10 @@
         width: 25px;
         color: slategrey;
         cursor: move;
+
+        &.no-drag {
+            cursor: default;
+        }
     }
 
     .button-right {
diff --git a/openslides/core/views.py b/openslides/core/views.py
index 3fb78ea38..3c984fe6f 100644
--- a/openslides/core/views.py
+++ b/openslides/core/views.py
@@ -179,6 +179,7 @@ class ProjectorViewSet(ModelViewSet):
         at the same time.
         """
         projector = self.get_object()
+        projector.scroll = 0
         elements = request.data.get("elements")
         preview = request.data.get("preview")
         history_element = request.data.get("append_to_history")