Skip to content

Commit abc3abb

Browse files
committed
update terminal::geometry #995
1 parent 1f126ac commit abc3abb

5 files changed

+28
-14
lines changed

__tests__/__snapshots__/terminal.spec.js.snap

+5-1
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,18 @@ exports[` 1`] = `
1010
"density": 1,
1111
"rows": 25,
1212
"terminal": {
13+
"content": {
14+
"height": 0,
15+
"width": 0,
16+
},
1317
"height": 0,
1418
"padding": {
1519
"bottom": 0,
1620
"left": 0,
1721
"right": 0,
1822
"top": 0,
1923
},
20-
"width": 0,
24+
"width": 800,
2125
},
2226
}
2327
`;

js/jquery.terminal-src.js

+9-4
Original file line numberDiff line numberDiff line change
@@ -9785,7 +9785,6 @@
97859785
// ---------------------------------------------------------------------
97869786
function get_scrollbar_width() {
97879787
var width = filler.outerWidth();
9788-
var container_width = self.width();
97899788
return container_width - width;
97909789
}
97919790
// ---------------------------------------------------------------------
@@ -10436,6 +10435,7 @@
1043610435
// -------------------------------------------------------------
1043710436
geometry: function() {
1043810437
var padding = get_padding();
10438+
var height = old_height + padding.top + padding.bottom;
1043910439
return {
1044010440
terminal: {
1044110441
padding: {
@@ -10444,8 +10444,12 @@
1044410444
top: padding.top,
1044510445
bottom: padding.bottom
1044610446
},
10447-
width: old_width + padding.left + padding.right,
10448-
height: old_height + padding.top + padding.bottom
10447+
content: {
10448+
width: old_width + padding.left + padding.right,
10449+
height: height
10450+
},
10451+
width: container_width,
10452+
height: height
1044910453
},
1045010454
density: pixel_density,
1045110455
char: char_size,
@@ -12114,7 +12118,7 @@
1211412118
var in_login = false;// some Methods should not be called when login
1211512119
// TODO: Try to use mutex like counter for pause/resume
1211612120
var onPause = $.noop;// used to indicate that user call pause onInit
12117-
var old_width, old_height, old_pixel_density;
12121+
var old_width, old_height, old_pixel_density, container_width;
1211812122
var delayed_commands = []; // used when exec commands while paused
1211912123
var settings = $.extend(
1212012124
{},
@@ -12751,6 +12755,7 @@
1275112755
}
1275212756
old_height = height;
1275312757
old_width = width;
12758+
container_width = self.width();
1275412759
old_pixel_density = pixel_density;
1275512760
}
1275612761
}

js/jquery.terminal.js

+11-6
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
*
4242
* broken image by Sophia Bai from the Noun Project (CC-BY)
4343
*
44-
* Date: Thu, 30 Jan 2025 13:12:50 +0000
44+
* Date: Sat, 22 Feb 2025 14:31:01 +0000
4545
*/
4646
/* global define, Map, BigInt */
4747
/* eslint-disable */
@@ -5439,7 +5439,7 @@
54395439
// -------------------------------------------------------------------------
54405440
$.terminal = {
54415441
version: 'DEV',
5442-
date: 'Thu, 30 Jan 2025 13:12:50 +0000',
5442+
date: 'Sat, 22 Feb 2025 14:31:01 +0000',
54435443
// colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
54445444
color_names: [
54455445
'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -9785,7 +9785,6 @@
97859785
// ---------------------------------------------------------------------
97869786
function get_scrollbar_width() {
97879787
var width = filler.outerWidth();
9788-
var container_width = self.width();
97899788
return container_width - width;
97909789
}
97919790
// ---------------------------------------------------------------------
@@ -10436,6 +10435,7 @@
1043610435
// -------------------------------------------------------------
1043710436
geometry: function() {
1043810437
var padding = get_padding();
10438+
var height = old_height + padding.top + padding.bottom;
1043910439
return {
1044010440
terminal: {
1044110441
padding: {
@@ -10444,8 +10444,12 @@
1044410444
top: padding.top,
1044510445
bottom: padding.bottom
1044610446
},
10447-
width: old_width + padding.left + padding.right,
10448-
height: old_height + padding.top + padding.bottom
10447+
content: {
10448+
width: old_width + padding.left + padding.right,
10449+
height: height
10450+
},
10451+
width: container_width,
10452+
height: height
1044910453
},
1045010454
density: pixel_density,
1045110455
char: char_size,
@@ -12114,7 +12118,7 @@
1211412118
var in_login = false;// some Methods should not be called when login
1211512119
// TODO: Try to use mutex like counter for pause/resume
1211612120
var onPause = $.noop;// used to indicate that user call pause onInit
12117-
var old_width, old_height, old_pixel_density;
12121+
var old_width, old_height, old_pixel_density, container_width;
1211812122
var delayed_commands = []; // used when exec commands while paused
1211912123
var settings = $.extend(
1212012124
{},
@@ -12751,6 +12755,7 @@
1275112755
}
1275212756
old_height = height;
1275312757
old_width = width;
12758+
container_width = self.width();
1275412759
old_pixel_density = pixel_density;
1275512760
}
1275612761
}

js/jquery.terminal.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/jquery.terminal.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)