From 1de2161ded041e5f9fcfff8bf54e4578685c321c Mon Sep 17 00:00:00 2001
From: Maximilian Krambach <maximilian.krambach@intevation.de>
Date: Thu, 29 Nov 2018 18:20:21 +0100
Subject: [PATCH] make choice dialog proper scrollable

---
 .../src/app/core/services/choice.service.ts   |  1 +
 .../choice-dialog.component.html              | 56 ++++++++++---------
 .../choice-dialog.component.scss              |  8 ++-
 3 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/client/src/app/core/services/choice.service.ts b/client/src/app/core/services/choice.service.ts
index 358991913..0dda9ebdd 100644
--- a/client/src/app/core/services/choice.service.ts
+++ b/client/src/app/core/services/choice.service.ts
@@ -36,6 +36,7 @@ export class ChoiceService extends OpenSlidesComponent {
     ): Promise<ChoiceAnswer> {
         const dialogRef = this.dialog.open(ChoiceDialogComponent, {
             minWidth: '250px',
+            maxHeight:'90vh',
             data: { title: title, choices: choices, multiSelect: multiSelect }
         });
         return dialogRef.afterClosed().toPromise();
diff --git a/client/src/app/shared/components/choice-dialog/choice-dialog.component.html b/client/src/app/shared/components/choice-dialog/choice-dialog.component.html
index afc62f495..ca7c51c71 100644
--- a/client/src/app/shared/components/choice-dialog/choice-dialog.component.html
+++ b/client/src/app/shared/components/choice-dialog/choice-dialog.component.html
@@ -1,30 +1,32 @@
-<h2 mat-dialog-title>{{ data.title | translate }}</h2>
-<div class="scrollmenu">
-    <mat-radio-group
-        #radio
-        name="choice"
-        *ngIf="!data.multiSelect"
-        class="choice-radio-group"
-        [(ngModel)]="selectedChoice"
-    >
-        <mat-radio-button class="choice-button" *ngFor="let choice of data.choices" [value]="choice.id">
-            {{ getChoiceTitle(choice) | translate }}
-        </mat-radio-button>
-    </mat-radio-group>
-
-    <mat-list *ngIf="data.multiSelect">
-        <mat-list-item *ngFor="let choice of data.choices">
-            <mat-checkbox [checked]="isChosen(choice)" (change)="toggleChoice(choice)">
+<div class="scrollmenu-outer">
+    <h2 mat-dialog-title>{{ data.title | translate }}</h2>
+    <div class="scrollmenu">
+        <mat-radio-group
+            #radio
+            name="choice"
+            *ngIf="!data.multiSelect"
+            class="choice-radio-group"
+            [(ngModel)]="selectedChoice"
+        >
+            <mat-radio-button class="choice-button" *ngFor="let choice of data.choices" [value]="choice.id">
                 {{ getChoiceTitle(choice) | translate }}
-            </mat-checkbox>
-        </mat-list-item>
-    </mat-list>
+            </mat-radio-button>
+        </mat-radio-group>
 
-    <span *ngIf="!data.choices.length" translate>No choices available</span>
-</div>
-<mat-dialog-actions>
-    <button *ngIf="!data.multiSelect || data.choices.length" mat-button (click)="closeDialog(true)">
-        <span translate>Ok</span>
-    </button>
-    <button mat-button (click)="closeDialog(false)"><span translate>Cancel</span></button>
+        <mat-list *ngIf="data.multiSelect">
+            <mat-list-item *ngFor="let choice of data.choices">
+                <mat-checkbox [checked]="isChosen(choice)" (change)="toggleChoice(choice)">
+                    {{ getChoiceTitle(choice) | translate }}
+                </mat-checkbox>
+            </mat-list-item>
+        </mat-list>
+
+        <span *ngIf="!data.choices.length" translate>No choices available</span>
+    </div>
+    <mat-dialog-actions>
+        <button *ngIf="!data.multiSelect || data.choices.length" mat-button (click)="closeDialog(true)">
+            <span translate>Ok</span>
+        </button>
+        <button mat-button (click)="closeDialog(false)"><span translate>Cancel</span></button>
 </mat-dialog-actions>
+</div>
\ No newline at end of file
diff --git a/client/src/app/shared/components/choice-dialog/choice-dialog.component.scss b/client/src/app/shared/components/choice-dialog/choice-dialog.component.scss
index 0c013a045..a99f46fc3 100644
--- a/client/src/app/shared/components/choice-dialog/choice-dialog.component.scss
+++ b/client/src/app/shared/components/choice-dialog/choice-dialog.component.scss
@@ -8,8 +8,10 @@ mat-radio-group {
 }
 
 .scrollmenu {
-    padding: 4px;
-    overflow-y: auto;
+    padding: 5px;
     display: block;
-    overflow-y: auto;
 }
+
+.scrollmenu-outer {
+    max-height:inherit;
+}
\ No newline at end of file