Merge branch 'master' of github.com:sehugg/8bitworkshop

This commit is contained in:
Steven Hugg 2018-11-26 07:10:52 -05:00
commit b5e3331323
5 changed files with 14 additions and 16 deletions

View File

@ -226,16 +226,12 @@ div.emulator {
margin-top: 20px auto 0;
}
div.emuoverlay {
position:relative;
left:0;
top:0;
width:100%;
display:flex;
flex-direction:column;
height:100%;
pointer-events:none;
}
div.emuscope {
background-color: #333;
pointer-events:auto;
}
div.emuspacer {
width:100%;

View File

@ -94,6 +94,7 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
<a tabindex="-1" href="#">Game Consoles</a>
<ul class="dropdown-menu">
<li><a class="dropdown-item" href="?platform=vcs" id="item_platform_vcs">Atari 2600/VCS</a></li>
<li><a class="dropdown-item" href="?platform=vcs-mame" id="item_platform_vcs">Atari 2600/VCS (MAME)</a></li>
</ul>
</li>
<li class="dropdown dropdown-submenu">
@ -105,7 +106,6 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
<li class="dropdown dropdown-submenu">
<a tabindex="-1" href="#">Arcade Systems</a>
<ul class="dropdown-menu">
<!--<li><a class="dropdown-item" href="?platform=vcs-mame" id="item_platform_vcs">Atari VCS (MAME)</a></li>-->
<li><a class="dropdown-item" href="?platform=vicdual" id="item_platform_vicdual">VIC Dual</a></li>
<li><a class="dropdown-item" href="?platform=mw8080bw" id="item_platform_mw8080bw">Midway 8080</a></li>
<li><a class="dropdown-item" href="?platform=galaxian-scramble" id="item_platform_galaxian_scramble">Galaxian/Scramble Hardware</a></li>

View File

@ -96,6 +96,7 @@ export interface Platform {
setRecorder?(recorder : EmuRecorder) : void;
advance?(novideo? : boolean) : void;
showHelp?(tool:string, ident?:string) : void;
resize?() : void;
debugSymbols? : DebugSymbols;
}

View File

@ -337,20 +337,18 @@ var VerilogPlatform = function(mainElement, options) {
gutterSize: 16,
onDrag: () => {
if (this.waveview) this.waveview.recreate();
vcanvas.css('position','relative');
vcanvas.css('top', -this.wavediv.height()+'px');
},
onDragStart: () => {
$(".emuoverlay").css("pointer-events", "auto"); // allow drag
},
onDragEnd: () => {
$(".emuoverlay").css("pointer-events", "none"); // disallow drag
//vcanvas.css('position','relative');
//vcanvas.css('top', -this.wavediv.height()+'px');
},
});
// setup mouse events
video.setupMouseEvents();
}
resize() {
if (this.waveview) this.waveview.recreate();
}
setGenInputs() {
useAudio = (audio != null);
//TODO debugCond = this.getDebugCallback();

View File

@ -1258,7 +1258,10 @@ export function setupSplits() {
split = Split(['#sidebar', '#workspace', '#emulator'], {
sizes: sizes,
minSize: [0, 250, 250],
onDragEnd: function() {
onDrag: () => {
if (platform && platform.resize) platform.resize();
},
onDragEnd: () => {
localStorage.setItem(splitName, JSON.stringify(split.getSizes()))
},
});