Merge branch 'work' into screen-layout

pull/1/head
cpsdqs 7 years ago
commit 7fe6b35243
Signed by untrusted user: cpsdqs
GPG Key ID: 3F59586BB7448DD1
  1. 4
      js/term/debug.js
  2. 13
      sass/pages/_term.scss

@ -58,7 +58,7 @@ module.exports = function attachDebugger (screen, connection) {
}, },
drawEnd () { drawEnd () {
endTime = Date.now() endTime = Date.now()
console.log(drawInfo.textContent = `Draw: ${lastReason} (${(endTime - startTime)} ms) with graphics=${screen.layout.renderer.graphics}`) drawInfo.textContent = `Draw: ${lastReason} (${(endTime - startTime)} ms), fancy_gfx=${screen.window.graphics}`
startDrawing() startDrawing()
}, },
setCell (cell, flags) { setCell (cell, flags) {
@ -253,7 +253,7 @@ module.exports = function attachDebugger (screen, connection) {
buttons.appendChild(redraw) buttons.appendChild(redraw)
const fancyGraphics = mk('button') const fancyGraphics = mk('button')
fancyGraphics.textContent = 'Toggle Graphics' fancyGraphics.textContent = 'Toggle Fancy Graphics'
fancyGraphics.addEventListener('click', e => { fancyGraphics.addEventListener('click', e => {
screen.layout.renderer.graphics = +!screen.layout.renderer.graphics screen.layout.renderer.graphics = +!screen.layout.renderer.graphics
screen.layout.renderer.draw('set-graphics') screen.layout.renderer.draw('set-graphics')

@ -114,18 +114,27 @@ body.term {
.debug-toolbar { .debug-toolbar {
line-height: 1.5; line-height: 1.5;
text-align: left; text-align: left;
padding: 6px; padding: 6px 12px 12px 12px;
font-family: $screen-stack; font-family: $screen-stack;
font-size: 12px; font-size: 12px;
white-space: normal; white-space: normal;
.toolbar-buttons {
button {
margin-right: 5px;
}
}
.heartbeat { .heartbeat {
float: right; float: right;
font-family: $font-stack; font-family: $font-stack;
color: crimson;
font-size: 120%;
padding-right: 5px;
&.beat { &.beat {
animation-name: heartbeat-beat; animation-name: heartbeat-beat;
animation-duration: 2s; animation-duration: 3s;
animation-fill-mode: forwards; animation-fill-mode: forwards;
@keyframes heartbeat-beat { @keyframes heartbeat-beat {

Loading…
Cancel
Save