github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-02 17:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes new browser window size when popping out terminal.

Browse Source 
Calculate the size more dynamically based on the size of the terminal
dom element.
This commit is contained in:
Simon Howe
2016-01-29 13:19:06 +01:00
parent 06aff39548
commit aad6e1fbeb
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client/app/scripts/components/terminal.js
View File

@@ -52,16 +52,16 @@ function terminalCellSize(wrapperNode, rows, cols) {
return {pixelPerCol, pixelPerRow};
}
function openNewWindow(url, minWidth = 200) {
function openNewWindow(url, bcr, minWidth = 200) {
const screenLeft = window.screenX || window.screenLeft;
const screenTop = window.screenY || window.screenTop;
const popoutWindowToolbarHeight = 51;
// TODO replace this stuff w/ looking up bounding box.
const windowOptions = {
width: Math.max(minWidth, window.innerWidth - 420 - 36 - 36 - 10),
height: window.innerHeight - 24 - 48 - popoutWindowToolbarHeight,
left: screenLeft + 36,
top: screenTop + (window.outerHeight - window.innerHeight) + 24,
width: Math.max(minWidth, bcr.width),
height: bcr.height - popoutWindowToolbarHeight,
left: screenLeft + bcr.left,
top: screenTop + (window.outerHeight - window.innerHeight) + bcr.top,
location: 'no',
};
@@ -219,8 +219,9 @@ export default class Terminal extends React.Component {
const paramString = JSON.stringify(this.props);
clickCloseTerminal(this.getPipeId());
const bcr = ReactDOM.findDOMNode(this).getBoundingClientRect();
const minWidth = this.state.pixelPerCol * 80 + (8 * 2);
openNewWindow(`terminal.html#!/state/${paramString}`, minWidth);
openNewWindow(`terminal.html#!/state/${paramString}`, bcr, minWidth);
}
handleResize() {