Commit 6a028b46 authored by Sanket Bhukan's avatar Sanket Bhukan
Browse files

Merge branch 'emscripten' into fix-sidebarTop

parents e8c07ffe 54438276
Pipeline #3336 failed with stage
in 0 seconds
......@@ -40,4 +40,8 @@ emscripten/purr-data/
CVS
.DS_Store
*.dmg
.vscode/
\ No newline at end of file
.vscode/
*.tar.bz2
emscripten/build
externals/**/*.wasm
pd/extra/**/*.wasm
\ No newline at end of file
......@@ -7,6 +7,10 @@
overflow-y: scroll;
}
#container {
overflow: hidden;
}
#console_bottom{
position: relative !important;
top: 0px !important;
......@@ -26,6 +30,14 @@
background-color: red !important;
}
#sidebar-collapse{
position: absolute;
top: 0px;
left: 0px;
z-index: 5;
color: #007BFF;
}
#sidebar-files ul{
list-style-type: none;
cursor: pointer;
......@@ -85,7 +97,6 @@ nav {
font-size: 14px;
width: 100%;
border: 1px solid #C0C2C4;
border-radius: 3px;
z-index: 999999;
}
......@@ -156,6 +167,7 @@ li .hr{
#pd-info{
display: block;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
}
#pd-info img{
......@@ -206,10 +218,9 @@ li .hr{
max-width: 100vw !important;
}
#canvas-content{
height: 70%;
overflow-y: scroll;
overflow-x: auto;
#canvas-content{
height: 70%;
overflow: auto;
border-top-width: 0ch;
}
......@@ -239,21 +250,19 @@ li .hr{
.patch_window_svg{
background-color: #f6f6f6;
min-height: 100%;
overflow: visible;
margin-top: 35px;
}
cursor: pointer;
}
.patch_window_svg > svg{
min-height: 100%;
position: relative;
margin-top: -1px;
margin-left: -1px;
overflow: visible;
}
position: relative;
margin-top: -1px;
margin-left: -1px;
overflow: visible;
}
.patch-holder{
height: 100%;
font-family: Dejavu Sans Mono !important;
}
......@@ -262,21 +271,25 @@ li .hr{
margin-bottom: 5px;
}
#div-svg-p{
position: relative;
z-index: 999999;
#div-svg-p{
position: relative;
z-index: 999999;
}
.dsp_toggle{
margin-left: 20px;
#sidebar-body {
overflow: auto;
}
/* Bootstrap */
.container-fluid{
/* Bootstrap */
.container-fluid{
background-color: transparent;
padding: 0px !important;
}
.card {
border-radius: 0px !important;
}
.card-body{
padding: 0px 5px !important;
}
......@@ -294,4 +307,5 @@ li .hr{
#reload-i{
font-size: 1em !important;
cursor: pointer;
transition: transform 1s linear;
}
\ No newline at end of file
......@@ -7,7 +7,8 @@
<meta name="description" content="Purr Data compiled for web with Emscripten" />
<meta name="keywords" content="purr-data" />
<meta name="generator" content="emsripten" />
<link rel="shortcut icon" type="image/jpg" href="./purr.png"/>
<link rel="stylesheet" type="text/css" href="./css/dejavu.css" />
<link id="page_style" rel="stylesheet" type="text/css" href="./css/default.css" />
<link rel="stylesheet" type="text/css" href="./css/webapp/webapp.css" />
......@@ -37,7 +38,7 @@
<div class="d-flex content-webapp" id="content">
<!-- Sidebar -->
<div class="card" id="sidebar">
<div class="card collapse show" id="sidebar">
<div class="card-body text-center" id="sidebar-body">
<!-- Pd logo -->
<div id="pd-info">
......@@ -51,7 +52,7 @@
<div class="d-flex ml-3">
<i class="fa fa fa-volume-up text-primary" aria-hidden="true"></i>
<h5>DSP</h5>
<label class="dsp_toggle">
<label class="dsp_toggle align-self-center ml-5">
<input type="checkbox" id="dsp_control" name="dsp_control" value="on" />
<span></span>
</label>
......@@ -59,12 +60,14 @@
<hr />
<!-- Files section -->
<div>
<div class="d-flex ml-3">
<i class="fa fa-folder-open-o text-primary" aria-hidden="true"></i>
<h5>Files</h5>
<i class="fa fa-refresh ml-auto mt-1 text-primary" id="reload-i" aria-hidden="true" onclick="pdbundle.pdgui.update_file_ls()"></i>
<div>
<div class="d-flex ml-3 float-left">
<i class="fa fa-folder-open-o text-primary" aria-hidden="true"></i>
<h5>Files</h5>
</div>
<i class="fa fa-refresh ml-5 mt-1 text-primary inline-block" id="reload-i" aria-hidden="true" onclick="pdbundle.pdgui.update_file_ls()"></i>
</div>
<div class="text-left" id="sidebar-files">
<ul class="ml-3 mt-2" id="file_ls"></ul>
<div class="text-secondary text-center" id="file_ls_empty">
......@@ -75,6 +78,10 @@
</div>
</div>
<a id="sidebar-collapse" class="m-2" data-toggle="collapse" data-target="#sidebar">
<i class="fa fa-angle-double-left"></i>
</a>
<!-- Canvas/Pd Windows -->
<div class="d-flex flex-column flex-fill" id="windows">
<!-- Canvas Container -->
......@@ -92,7 +99,7 @@
<div class="console-find-webapp" id="console_find" style="display: none;">
<div class="d-flex justify-content-end">
<label><input type="text" id="console_find_text" name="console_find_text" defaultValue="Search in Console" style="width: 10em;" placeholder="Search in Console" /> </label>
<label class="highlight-find align-self-center">
<label class="highlight-find align-self-center" style = "color: #6c757d">
Highlight All
<input type="checkbox" id="console_find_highlight" name="console_find_highlight" onchange="console_find_highlight_all(this);" />
</label>
......@@ -103,7 +110,7 @@
<div class="collapse show" id="console_bottom">
<div class="card-block">
<div id="printout">
<pre id="p1" style="white-space: pre-wrap;"></pre>
<pre id="p1" style="white-space: pre-wrap; overflow: hidden;"></pre>
</div>
</div>
</div>
......@@ -535,7 +542,25 @@
$(document).ready(function () {
$("#loading-modal").modal("show", { backdrop: "static", keyboard: false });
});
var counter = 0;
$('#reload-i').click(function () {
counter += 360;
$('#reload-i').css('transform', 'rotate(' + counter + 'deg)')
});
</script>
<script>
$(document).ready(function(){
$("#sidebar").on('shown.bs.collapse', function () {
$("#sidebar-collapse").children("i").eq(0).addClass("fa-angle-double-left").removeClass("fa-angle-double-right")
})
$("#sidebar").on('hidden.bs.collapse', function () {
$("#sidebar-collapse").children("i").eq(0).addClass("fa-angle-double-right").removeClass("fa-angle-double-left")
})
});
</script>
</body>
</html>
......@@ -139,7 +139,8 @@ function add_shortcuts(cid){
shortcut += e.altKey ? "Alt+": "";
// Add key
shortcut += e.key.toUpperCase();
if(window.shortkeys[cid].hasOwnProperty(shortcut)){
if(window.shortkeys[cid].hasOwnProperty(shortcut)){
e.preventDefault()
window.shortkeys[cid][shortcut].click();
}
}
......
......@@ -1232,8 +1232,7 @@ function gui_canvas_set_cordinspector(cid, state) {
}
function canvas_set_scrollbars(cid, scroll) {
patchwin[cid].window.document.body.style.
overflow = scroll ? "visible" : "hidden";
patchwin[cid].window.document.body.style.overflow = "hidden";
}
exports.canvas_set_scrollbars = canvas_set_scrollbars;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment