Skip to content

[WIP] Init improving Annotation desktop zoom. #245

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] Init improving Annotation desktop zoom. #245

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
16,221 changes: 8,111 additions & 8,110 deletions dist/libs/common-components/bundles/groupdocs.examples.angular-common-components.umd.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/libs/common-components/bundles/groupdocs.examples.angular-common-components.umd.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/libs/common-components/bundles/groupdocs.examples.angular-common-components.umd.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ibs/common-components/bundles/groupdocs.examples.angular-common-components.umd.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions dist/libs/common-components/esm2015/lib/context-menu/context-menu.component.js
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions dist/libs/common-components/esm5/lib/context-menu/context-menu.component.js
View file
Open in desktop

Large diffs are not rendered by default.

59 changes: 30 additions & 29 deletions dist/libs/common-components/fesm2015/groupdocs.examples.angular-common-components.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/libs/common-components/fesm2015/groupdocs.examples.angular-common-components.js.map
View file
Open in desktop

Large diffs are not rendered by default.

59 changes: 30 additions & 29 deletions dist/libs/common-components/fesm5/groupdocs.examples.angular-common-components.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/libs/common-components/fesm5/groupdocs.examples.angular-common-components.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/libs/common-components/groupdocs.examples.angular-common-components.metadata.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions libs/annotation/src/lib/annotation-app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<gd-button [disabled]="formatDisabled" [icon]="'download'" [tooltip]="'Download'"
(click)="downloadFile()" *ngIf="downloadConfig"></gd-button>
<gd-button [disabled]="formatDisabled" [icon]="'save'" [tooltip]="'Save'" (click)="annotate()"></gd-button>
<gd-button class="desktop-hide" [disabled]="formatDisabled" [icon]="'search-plus'" [tooltip]="'Zoom In'"
<gd-button [disabled]="formatDisabled" [icon]="'search-plus'" [tooltip]="'Zoom In'"
(click)="zoomIn()" *ngIf="zoomConfig"></gd-button>
<gd-button class="desktop-hide" [disabled]="formatDisabled" [icon]="'search-minus'" [tooltip]="'Zoom Out'"
<gd-button [disabled]="formatDisabled" [icon]="'search-minus'" [tooltip]="'Zoom Out'"
(click)="zoomOut()" *ngIf="zoomConfig"></gd-button>
<gd-button [disabled]="formatDisabled" [icon]="annotationsHidden ? 'toggle-off' : 'toggle-on'" [tooltip]="'Hide annotations'" (click)="hideAnnotations()"></gd-button>
</div>
Expand Down
8 changes: 0 additions & 8 deletions libs/annotation/src/lib/annotation-app.component.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@
}
}

.desktop-hide {
display: none;
}

@media @phone-down {
::ng-deep .logo {
::ng-deep .icon {
Expand All @@ -83,10 +79,6 @@
}
}

.desktop-hide {
display: block;
}

.gd-document {
height:~"calc(100% - 120px)";
}
Expand Down
4 changes: 2 additions & 2 deletions libs/annotation/src/lib/annotation-app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@ export class AnnotationAppComponent implements OnInit {
this.isDesktop = _windowService.isDesktop();
_windowService.onResize.subscribe((w) => {
this.isDesktop = _windowService.isDesktop();
if (!this.isDesktop) {
//if (!this.isDesktop) {
this.refreshZoom();
}
//}
});

this._activeAnnotationService.activeChange.subscribe((id: number) => {
Expand Down
8 changes: 4 additions & 4 deletions libs/common-components/src/lib/context-menu/context-menu.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ export class ContextMenuComponent implements OnInit {
});

_zoomService.zoomChange.subscribe((val: number) => {
if (this.isMobile)
{
this.changeScale(val);
}
this.changeScale(val);
});
}

Expand All @@ -50,6 +47,9 @@ export class ContextMenuComponent implements OnInit {

changeScale(val: number){
this.renderer.setStyle(this._elementRef.nativeElement.querySelector('.gd-context-menu'), 'transform', 'scale(' + 1/(val/100) + ')');
if (!this.isMobile && val && val !== 100) {
this.renderer.setStyle(this._elementRef.nativeElement.querySelector('.gd-context-menu'), 'left', this.translation + 'px');
}
}

saveChanges() {
Expand Down