Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 05:58:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8795 from Atlante45/fix/content-update-window

Browse source 
Update window size automaticatlly
This commit is contained in:
Clément Brisset 2016-10-13 10:53:56 -07:00 committed by GitHub
commit b53559a64a
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server-console/src/content-update.html
View file

@ -6,7 +6,7 @@
<link rel="stylesheet" type="text/css" href="content-update.css"></link> <link rel="stylesheet" type="text/css" href="content-update.css"></link>
</head> </head>
<body onload="ready()"> <body onload="ready()">
<div class="colmask"> <div class="colmask" id="content">
<h3>We backed up your old Sandbox content, just in case.</h3> <h3>We backed up your old Sandbox content, just in case.</h3>
<p><b>To restore it, follow these steps:</b> <p><b>To restore it, follow these steps:</b>
@ -45,9 +45,9 @@
</div> </div>
<div class="footer"> <div class="footer">
<p>For more information about managing your high Fidelity Sandbox Server, check out our docs: <a href="https://wiki.highfidelity.com/wiki/Sandbox" target="_blank">wiki.highfidelity.com/wiki/Sandbox</a>
<p>For more information about managing your high Fidelity Sandbox Server, check out our docs: <a href="https://wiki.highfidelity.com/wiki/Sandbox" target="_blank">wiki.highfidelity.com/wiki/Sandbox</a> </p>
</div>
</div> </div>
</div>
</body> </body>
</html> </html>

5
server-console/src/content-update.js
View file

@ -6,6 +6,11 @@ function ready() {
electron.ipcRenderer.on('update', function(event, message) { electron.ipcRenderer.on('update', function(event, message) {
$('#directory').html(message); $('#directory').html(message);
electron.ipcRenderer.send('setSize', {
width: $(window).width(),
height: $('#content').height() + 50
});
}); });
electron.ipcRenderer.send('ready'); electron.ipcRenderer.send('ready');

3
server-console/src/main.js
View file

@ -530,6 +530,9 @@ function openBackupInstructions(folder) {
} }
window.show(); window.show();
electron.ipcMain.on('setSize', function(event, obj) {
window.setSize(obj.width, obj.height);
});
electron.ipcMain.on('ready', function() { electron.ipcMain.on('ready', function() {
console.log("got ready"); console.log("got ready");
window.webContents.send('update', folder); window.webContents.send('update', folder);