mirror of
https://github.com/sehugg/8bitworkshop.git
synced 2024-06-11 12:29:29 +00:00
Merge branch 'master' of github.com:sehugg/8bitworkshop
This commit is contained in:
commit
b5e3331323
|
@ -226,16 +226,12 @@ div.emulator {
|
||||||
margin-top: 20px auto 0;
|
margin-top: 20px auto 0;
|
||||||
}
|
}
|
||||||
div.emuoverlay {
|
div.emuoverlay {
|
||||||
position:relative;
|
display:flex;
|
||||||
left:0;
|
flex-direction:column;
|
||||||
top:0;
|
|
||||||
width:100%;
|
|
||||||
height:100%;
|
height:100%;
|
||||||
pointer-events:none;
|
|
||||||
}
|
}
|
||||||
div.emuscope {
|
div.emuscope {
|
||||||
background-color: #333;
|
background-color: #333;
|
||||||
pointer-events:auto;
|
|
||||||
}
|
}
|
||||||
div.emuspacer {
|
div.emuspacer {
|
||||||
width:100%;
|
width:100%;
|
||||||
|
|
|
@ -94,6 +94,7 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
|
||||||
<a tabindex="-1" href="#">Game Consoles</a>
|
<a tabindex="-1" href="#">Game Consoles</a>
|
||||||
<ul class="dropdown-menu">
|
<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" 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>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li class="dropdown dropdown-submenu">
|
<li class="dropdown dropdown-submenu">
|
||||||
|
@ -105,7 +106,6 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
|
||||||
<li class="dropdown dropdown-submenu">
|
<li class="dropdown dropdown-submenu">
|
||||||
<a tabindex="-1" href="#">Arcade Systems</a>
|
<a tabindex="-1" href="#">Arcade Systems</a>
|
||||||
<ul class="dropdown-menu">
|
<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=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=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>
|
<li><a class="dropdown-item" href="?platform=galaxian-scramble" id="item_platform_galaxian_scramble">Galaxian/Scramble Hardware</a></li>
|
||||||
|
|
|
@ -96,6 +96,7 @@ export interface Platform {
|
||||||
setRecorder?(recorder : EmuRecorder) : void;
|
setRecorder?(recorder : EmuRecorder) : void;
|
||||||
advance?(novideo? : boolean) : void;
|
advance?(novideo? : boolean) : void;
|
||||||
showHelp?(tool:string, ident?:string) : void;
|
showHelp?(tool:string, ident?:string) : void;
|
||||||
|
resize?() : void;
|
||||||
|
|
||||||
debugSymbols? : DebugSymbols;
|
debugSymbols? : DebugSymbols;
|
||||||
}
|
}
|
||||||
|
|
|
@ -337,20 +337,18 @@ var VerilogPlatform = function(mainElement, options) {
|
||||||
gutterSize: 16,
|
gutterSize: 16,
|
||||||
onDrag: () => {
|
onDrag: () => {
|
||||||
if (this.waveview) this.waveview.recreate();
|
if (this.waveview) this.waveview.recreate();
|
||||||
vcanvas.css('position','relative');
|
//vcanvas.css('position','relative');
|
||||||
vcanvas.css('top', -this.wavediv.height()+'px');
|
//vcanvas.css('top', -this.wavediv.height()+'px');
|
||||||
},
|
|
||||||
onDragStart: () => {
|
|
||||||
$(".emuoverlay").css("pointer-events", "auto"); // allow drag
|
|
||||||
},
|
|
||||||
onDragEnd: () => {
|
|
||||||
$(".emuoverlay").css("pointer-events", "none"); // disallow drag
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
// setup mouse events
|
// setup mouse events
|
||||||
video.setupMouseEvents();
|
video.setupMouseEvents();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
resize() {
|
||||||
|
if (this.waveview) this.waveview.recreate();
|
||||||
|
}
|
||||||
|
|
||||||
setGenInputs() {
|
setGenInputs() {
|
||||||
useAudio = (audio != null);
|
useAudio = (audio != null);
|
||||||
//TODO debugCond = this.getDebugCallback();
|
//TODO debugCond = this.getDebugCallback();
|
||||||
|
|
|
@ -1258,7 +1258,10 @@ export function setupSplits() {
|
||||||
split = Split(['#sidebar', '#workspace', '#emulator'], {
|
split = Split(['#sidebar', '#workspace', '#emulator'], {
|
||||||
sizes: sizes,
|
sizes: sizes,
|
||||||
minSize: [0, 250, 250],
|
minSize: [0, 250, 250],
|
||||||
onDragEnd: function() {
|
onDrag: () => {
|
||||||
|
if (platform && platform.resize) platform.resize();
|
||||||
|
},
|
||||||
|
onDragEnd: () => {
|
||||||
localStorage.setItem(splitName, JSON.stringify(split.getSizes()))
|
localStorage.setItem(splitName, JSON.stringify(split.getSizes()))
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue
Block a user