Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding compact view option also for filmstrip view #706

Merged
merged 1 commit into from
Feb 20, 2023
Merged

Adding compact view option also for filmstrip view #706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/app/components/home.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,14 +847,20 @@
[hubName]="appState.hubName"
[imgHeight]="previewHeight"

[compactView]="settingsButtons['compactView'].toggled"
[darkMode]="settingsButtons['darkMode'].toggled"
[hoverScrub]="settingsButtons['hoverScrub'].toggled"
[largerFont]="settingsButtons['fontSizeLarger'].toggled"
[showMeta]="settingsButtons['showMoreInfo'].toggled"

style="display: block"
[ngStyle]="{ height: previewHeight + textPaddingHeight + 10 + 'px'}"
></app-filmstrip-item>
[ngStyle]="{
height: previewHeight
+ textPaddingHeight
+ (settingsButtons['compactView'].toggled ? 0 : 10)
+ 'px'
}"
></app-filmstrip-item>
</ng-container>

<!-- ==================================== FULL VIEW ==================================== -->
Expand Down
5 changes: 4 additions & 1 deletion src/app/components/home.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1600,6 +1600,7 @@ export class HomeComponent implements OnInit, AfterViewInit {
if (
this.settingsButtons['showThumbnails'].toggled
|| this.settingsButtons['showClips'].toggled
|| this.settingsButtons['showFilmstrip'].toggled
) {
this.computeTextBufferAmount();
}
Expand Down Expand Up @@ -1799,7 +1800,9 @@ export class HomeComponent implements OnInit, AfterViewInit {
break;

case 'showFilmstrip':
if (this.settingsButtons.showMoreInfo.toggled) {
if (this.settingsButtons.compactView.toggled) {
this.textPaddingHeight = 0;
} else if (this.settingsButtons.showMoreInfo.toggled) {
this.textPaddingHeight = 20;
} else {
this.textPaddingHeight = 0;
Expand Down
3 changes: 1 addition & 2 deletions src/app/components/views/filmstrip/filmstrip.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<div
class="meta-container"
[ngStyle]="{ height: elHeight + 'px'}"
[ngClass]="compactView ? 'compact-margins': 'meta-container'"
>

<div
#filmstripHolder
(mousemove)="updateFilmXoffset($event)"
Expand Down
2 changes: 2 additions & 0 deletions src/app/components/views/filmstrip/filmstrip.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { RightClickEmit, VideoClickEmit } from '../../../../../interfaces/shared
selector: 'app-filmstrip-item',
templateUrl: './filmstrip.component.html',
styleUrls: [
'../clip-and-preview.scss',
'../film-and-full.scss',
'../time-and-rez.scss',
'../selected.scss'
Expand All @@ -28,6 +29,7 @@ export class FilmstripComponent implements OnInit {

@Input() video: ImageElement;

@Input() compactView: boolean;
@Input() darkMode: boolean;
@Input() elHeight: number;
@Input() folderPath: string;
Expand Down