h/karousel
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Desktop.scrollCenterVisible: stop prioritizing visible columns (this is now done by ColumnRange.addNeighbors)

Browse Source
This commit is contained in:
Peter Fajdiga
2024-02-18 20:21:34 +01:00
parent 1a449c238d
commit 2fe1be99cb
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Actions.ts
View File

@@ -197,7 +197,7 @@ namespace Actions {
}
column.setWidth(newWidth, true);
desktop.scrollCenterVisible(column, false);
desktop.scrollCenterVisible(column);
desktop.onLayoutChanged();
desktop.autoAdjustScroll();
});
@@ -246,7 +246,7 @@ namespace Actions {
}
column.setWidth(newWidth, true);
desktop.scrollCenterVisible(column, true);
desktop.scrollCenterVisible(column);
desktop.onLayoutChanged();
desktop.autoAdjustScroll();
});

15
src/layout/Desktop.ts
View File

@@ -78,13 +78,10 @@ class Desktop {
this.adjustScroll(Math.round(windowCenter - screenCenter), false);
}
public scrollCenterVisible(focusedColumn: Column, prioritiseVisible: boolean) {
public scrollCenterVisible(focusedColumn: Column) {
const columnRange = new Desktop.ColumnRange(focusedColumn);
const visibleRange = this.getCurrentVisibleRange();
if (prioritiseVisible) {
columnRange.addNeighbors(visibleRange, this.grid.config.gapsInnerHorizontal, column => column.isVisible(visibleRange, true));
}
columnRange.addNeighbors(visibleRange, this.grid.config.gapsInnerHorizontal, () => true);
columnRange.addNeighbors(visibleRange, this.grid.config.gapsInnerHorizontal);
this.scrollCenterRange(columnRange);
}
@@ -242,17 +239,15 @@ namespace Desktop {
this.width = initialColumn.getWidth();
}
public addNeighbors(visibleRange: Desktop.Range, gap: number, condition: (column: Column) => boolean) {
public addNeighbors(visibleRange: Desktop.Range, gap: number) {
const grid = this.left.grid;
const columnRange = this;
function canFit(column: Column) {
return columnRange.width + gap + column.getWidth() <= visibleRange.getWidth()
return columnRange.width + gap + column.getWidth() <= visibleRange.getWidth();
}
function isUsable(column: Column|null) {
return column !== null &&
canFit(column) &&
condition(column)
return column !== null && canFit(column);
}
let leftColumn = grid.getPrevColumn(this.left);

2
src/layout/ScrollerGrouped.ts
View File

@@ -1,6 +1,6 @@
class ScrollerGrouped {
public scrollToColumn(desktop: Desktop, column: Column) {
desktop.scrollCenterVisible(column, true);
desktop.scrollCenterVisible(column);
}
public clampScrollX(desktop: Desktop, x: number) {