Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-04-10 19:26:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

track rows in sw

Browse Source
This commit is contained in:
sawka 2022-11-23 14:45:20 -08:00
parent a4b15ca57e
commit 06c3a240b1
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main.tsx
View File

@ -2096,23 +2096,26 @@ class ScreenWindowView extends React.Component<{sw : ScreenWindow}, {}> {
windowViewRef : React.RefObject<any>;
width : mobx.IObservableValue<number> = mobx.observable.box(0, {name: "sw-view-width"});
setWidth_debounced : (width : number) => void;
height : mobx.IObservableValue<number> = mobx.observable.box(0, {name: "sw-view-height"});
setSize_debounced : (width : number, height : number) => void;
constructor(props : any) {
super(props);
this.setWidth_debounced = debounce(1000, this.setWidth.bind(this));
this.setSize_debounced = debounce(1000, this.setSize.bind(this));
this.windowViewRef = React.createRef();
}
setWidth(width : number) : void {
setSize(width : number, height : number) : void {
mobx.action(() => {
this.width.set(width);
this.height.set(height);
let {sw} = this.props;
let cols = widthToCols(width);
if (sw == null || cols == 0) {
let rows = termRowsFromHeight(height);
if (sw == null || cols == 0 || rows == 0) {
return;
}
sw.colsCallback(cols);
sw.termSizeCallback(rows, cols);
})();
}
@ -2120,7 +2123,8 @@ class ScreenWindowView extends React.Component<{sw : ScreenWindow}, {}> {
let wvElem = this.windowViewRef.current;
if (wvElem != null) {
let width = wvElem.offsetWidth;
this.setWidth(width);
let height = wvElem.offsetHeight;
this.setSize(width, height);
this.rszObs = new ResizeObserver(this.handleResize.bind(this));
this.rszObs.observe(wvElem);
}
@ -2138,7 +2142,8 @@ class ScreenWindowView extends React.Component<{sw : ScreenWindow}, {}> {
}
let entry = entries[0];
let width = entry.target.offsetWidth;
this.setWidth_debounced(width);
let height = entry.target.offsetHeight;
this.setSize_debounced(width, height);
}
getWindow() : Window {

16
src/model.ts
View File

@ -457,10 +457,11 @@ class ScreenWindow {
return (this.sessionId == activeScreen.sessionId) && (this.screenId == activeScreen.screenId);
}
colsCallback(cols : number) : void {
if (!this.isActive() || cols == 0) {
termSizeCallback(rows : number, cols : number) : void {
if (!this.isActive() || cols == 0 || rows == 0) {
return;
}
this.lastRows = rows;
if (cols == this.lastCols) {
return;
}
@ -471,16 +472,6 @@ class ScreenWindow {
GlobalCommandRunner.resizeWindow(this.windowId, cols);
}
rowsCallback(rows : number) : void {
if (!this.isActive() || rows == 0) {
return;
}
if (rows == this.lastCols) {
return;
}
this.lastRows = rows;
}
getTermWrap(cmdId : string) : TermWrap {
return this.terms[cmdId];
}
@ -1621,6 +1612,7 @@ class Model {
windowid : null,
remote : null,
termopts : {},
winsize: null,
};
let session = this.getActiveSession();
if (session != null) {