From 608aead8284a0f73f91bc8c39fb301f2a642be97 Mon Sep 17 00:00:00 2001 From: Xiao Gui <xgui3783@gmail.com> Date: Wed, 16 Oct 2019 08:47:09 +0200 Subject: [PATCH] chore: updating tooltip feat: scaled resizing of selected regions --- src/ui/config/config.component.ts | 6 +++--- src/ui/databrowserModule/databrowser/databrowser.style.css | 7 +++++++ .../databrowser/databrowser.template.html | 2 +- .../listView/singleDatasetListView.template.html | 2 ++ src/ui/searchSideNav/searchSideNav.style.css | 1 + 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/ui/config/config.component.ts b/src/ui/config/config.component.ts index a52647cbd..d5378ffde 100644 --- a/src/ui/config/config.component.ts +++ b/src/ui/config/config.component.ts @@ -8,9 +8,9 @@ import { NG_VIEWER_ACTION_TYPES, SUPPORTED_PANEL_MODES } from 'src/services/stat import { isIdentityQuat } from '../nehubaContainer/util'; import { AtlasViewerConstantsServices } from 'src/atlasViewer/atlasViewer.constantService.service'; -const GPU_TOOLTIP = `GPU TOOLTIP` -const ANIMATION_TOOLTIP = `ANIMATION_TOOLTIP` -const MOBILE_UI_TOOLTIP = `MOBILE_UI_TOOLTIP` +const GPU_TOOLTIP = `Higher GPU usage can cause crashes on lower end machines` +const ANIMATION_TOOLTIP = `Animation can cause slowdowns in lower end machines` +const MOBILE_UI_TOOLTIP = `Mobile UI enables touch controls` const ROOT_TEXT_ORDER : [string, string, string, string] = ['Coronal', 'Sagittal', 'Axial', '3D'] const OBLIQUE_ROOT_TEXT_ORDER : [string, string, string, string] = ['Slice View 1', 'Slice View 2', 'Slice View 3', '3D'] diff --git a/src/ui/databrowserModule/databrowser/databrowser.style.css b/src/ui/databrowserModule/databrowser/databrowser.style.css index e681a8849..0a854b80f 100644 --- a/src/ui/databrowserModule/databrowser/databrowser.style.css +++ b/src/ui/databrowserModule/databrowser/databrowser.style.css @@ -8,3 +8,10 @@ radio-list { display: block; } + + +/* grow 3x shrink 1x basis 2.5 x 50px (2.5 rows) */ +.dataset-container +{ + flex: 3 1 125px; +} diff --git a/src/ui/databrowserModule/databrowser/databrowser.template.html b/src/ui/databrowserModule/databrowser/databrowser.template.html index 733920c79..1cb0f8543 100644 --- a/src/ui/databrowserModule/databrowser/databrowser.template.html +++ b/src/ui/databrowserModule/databrowser/databrowser.template.html @@ -67,7 +67,7 @@ <!-- datawrapper --> <ng-container *ngIf="dataentries | filterDataEntriesByMethods : visibleCountedDataM as filteredDataEntry"> - <mat-card-content class="h-100 w-100 overflow-hidden"> + <mat-card-content class="dataset-container w-100 overflow-hidden"> <cdk-virtual-scroll-viewport class="h-100" autosize> diff --git a/src/ui/databrowserModule/singleDataset/listView/singleDatasetListView.template.html b/src/ui/databrowserModule/singleDataset/listView/singleDatasetListView.template.html index abc99ee16..559034d31 100644 --- a/src/ui/databrowserModule/singleDataset/listView/singleDatasetListView.template.html +++ b/src/ui/databrowserModule/singleDataset/listView/singleDatasetListView.template.html @@ -37,7 +37,9 @@ </ng-container> <!-- more menu --> + <!-- hidden for now --> <button mat-icon-button + *ngIf="false" iav-stop="mousedown click" [matMenuTriggerFor]="singleDatasetMenu" class="flex-grow-0 flex-shrink-0 no-focus"> diff --git a/src/ui/searchSideNav/searchSideNav.style.css b/src/ui/searchSideNav/searchSideNav.style.css index 9cacc7579..373ba5c0d 100644 --- a/src/ui/searchSideNav/searchSideNav.style.css +++ b/src/ui/searchSideNav/searchSideNav.style.css @@ -8,6 +8,7 @@ .h-117px { min-height:117px!important; + flex-basis: 117px!important; } .mat-divider-full-width -- GitLab