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

Jump to bottom

fix(sheet): render viewport wrong size #1727

Draft
wants to merge 13 commits into
base: dev
Choose a base branch
from
Draft

fix(sheet): render viewport wrong size #1727

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b5287a8
fix(sheet): render viewport wrong size
DR-Univer Mar 28, 2024
0027171
fix: new viewport need more param
lumixraku May 20, 2024
ffe97fd
feat: cache by viewport
lumixraku Mar 30, 2024
5b16202
fix: markdirty & scrolling was conflict before, so scrolling & dirty …
lumixraku May 9, 2024
1ec8a2d
fix: 0510-1725
lumixraku May 10, 2024
a3111e4
fix: blurry when applyCache especially in windows 175%
lumixraku May 11, 2024
b700bbb
fix: merge cells background
lumixraku May 11, 2024
43bfb91
feat: fix cf render error on printing mode
weird94 May 14, 2024
5f5a6fc
fix: viewport make dirty false
lumixraku May 16, 2024
4c2d87e
test(facade): fix canvas mock
jikkai May 15, 2024
f97db72
fix: should beginPath before clip()
lumixraku May 21, 2024
cfae458
chore: comments to english
lumixraku May 21, 2024
0b81b50
fix: change viewport update timing
lumixraku May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: new viewport need more param
  • Loading branch information
@lumixraku
lumixraku committed May 24, 2024
commit 00271716e0e1ece6e9c3265ea99b4af8c8f3591c
2 changes: 2 additions & 0 deletions packages/slides/src/views/render/adaptors/docs-adaptor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ export class DocsAdaptor extends ObjectAdaptor {
top: 0,
bottom: 0,
right: 0,
isRelativeX: true,
isRelativeY: true,
isWheelPreventDefaultX: true,
});

Expand Down
2 changes: 2 additions & 0 deletions packages/slides/src/views/render/adaptors/slide-adaptor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ export class SlideAdaptor extends ObjectAdaptor {
top: 0,
bottom: 0,
right: 0,
isRelativeX: true,
isRelativeY: true,
});

viewMain.closeClip();
Expand Down
3 changes: 3 additions & 0 deletions packages/slides/src/views/render/adaptors/spreadsheet-adaptor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,16 @@ export class SpreadsheetAdaptor extends ObjectAdaptor {
top: columnHeaderHeightScale,
bottom: 0,
right: 0,
isRelativeX: true,
isRelativeY: true,
isWheelPreventDefaultX: true,
});
const viewTop = new Viewport(SHEET_VIEW_KEY.VIEW_TOP + id, scene, {
left: rowHeaderWidthScale,
height: columnHeaderHeightScale,
top: 0,
right: 0,
isRelativeX: true,
isWheelPreventDefaultX: true,
});
const viewLeft = new Viewport(SHEET_VIEW_KEY.VIEW_LEFT + id, scene, {
Expand Down
5 changes: 5 additions & 0 deletions packages/slides/src/views/render/canvas-view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ export class CanvasView extends RxDisposable {
return this._renderManagerService.getRenderById(slideDataModel.getUnitId());
}

// eslint-disable-next-line max-lines-per-function
private _addNewRender(unitId: string) {
const slideDataModel = this._univerInstanceService.getUnit<SlideDataModel>(unitId, UniverInstanceType.UNIVER_SLIDE);

Expand Down Expand Up @@ -175,6 +176,8 @@ export class CanvasView extends RxDisposable {
top: 0,
bottom: 0,
right: 0,
isRelativeX: true,
isRelativeY: true,
isWheelPreventDefaultX: true,
});

Expand Down Expand Up @@ -412,6 +415,8 @@ export class CanvasView extends RxDisposable {
top: 0,
bottom: 0,
right: 0,
isRelativeX: true,
isRelativeY: true,
});

viewMain.closeClip();
Expand Down