diff --git a/assets/disk0/tvdos/bin/taut.js b/assets/disk0/tvdos/bin/taut.js index 1f20679..334ac0d 100644 --- a/assets/disk0/tvdos/bin/taut.js +++ b/assets/disk0/tvdos/bin/taut.js @@ -83,6 +83,9 @@ doubledot:"\u008419u", statusstop:"\u008420u\u008421u", statusplay:"\u008422u\u008423u", playhead:"\u00A7", + +leftshade:'\u00B0', +rightshade:'\u00B2', } const fxNames = { @@ -566,11 +569,13 @@ const colStatus = 253 const colVoiceHdr = 230 const colSep = 252 const colPushBtnBack = 143 -const colTabBarBack = 187 -const colTabBarOrn = 91//135 +const colTabBarBack = 225 +const colTabBarBack2 = 135 +const colTabBarOrn = 136 const colBrand = 211 -const colPopupBack = 91 - +const colPopupBack = 52 +const colTabActive = 239 +const colTabInactive = 45 // protip: avoid using colour zero const colWHITE = 239 @@ -692,9 +697,16 @@ function drawTabBar() { if (i > 0) con.curs_right(TAB_GAP); let tabName = PANEL_NAMES[i] - let col = (currentPanel === i) ? 161 : 240 + let colFore = (currentPanel === i) ? colTabActive : colTabInactive + let colBack = (currentPanel === i) ? colTabBarBack2 : colTabBarBack + let colFore2 = (currentPanel === i) ? colTabBarBack2 : colTabBarBack + let colBack2 = (currentPanel === i) ? colTabBarBack : colTabBarBack + let spcL = (currentPanel === i) ? sym.leftshade : ' ' + let spcR = (currentPanel === i) ? sym.rightshade : ' ' - con.color_pair(col, colTabBarBack); print(` ${tabName} `) + con.color_pair(colFore2, colBack2); print(spcL) + con.color_pair(colFore, colBack); print(tabName) + con.color_pair(colFore2, colBack2); print(spcR) } @@ -1117,7 +1129,8 @@ function setTimelineRowStyle(style) { ///////////////////////////////////////////////////////////////////////////////////////////////////////////// con.curs_set(0) -graphics.setBackground(34, 38, 51) +graphics.setBackground(0x23,0x39,0x58) +//graphics.setBackground(0x12,0x32,0x5f) graphics.setGraphicsMode(0) let currentPanel = VIEW_TIMELINE @@ -1778,6 +1791,11 @@ const panelPatterns = new win.WindowObject(1, PTNVIEW_OFFSET_Y, SCRW, PTNVIEW_HE // On exit, the sub-program sets _G.taut_nextPanel to request a tab switch. function makeExternalPanelDraw(progName) { return function(wo) { + // stop any playback first + stopPlayback() + // update the top bar + drawAlwaysOnElems() + _G.taut_nextPanel = undefined _G.shell.execute(`${progName} ${fullPathObj.full} ${currentPanel}`) } @@ -2071,9 +2089,14 @@ const popupDrawFrame = (wo) => { // imprint title let titleWidth = wo.title.length con.move(wo.y, wo.x + (((wo.width - titleWidth - 2) & 254) >>> 1)) - let col = (wo.isHighlighted) ? 161 : 240 - con.color_pair(col, colTabBarBack) - print(` ${wo.title} `) + + let colFore = colTabActive + let colBack = colTabBarBack2 + let colFore2 = colTabBarBack2 + let colBack2 = colTabBarBack + con.color_pair(colFore2, colBack2); print(sym.leftshade) + con.color_pair(colFore, colBack); print(wo.title) + con.color_pair(colFore2, colBack2); print(sym.rightshade) // fill content area for (let r = 1; r < wo.height - 1; r++) { diff --git a/assets/disk0/tvdos/bin/taut_fileop.js b/assets/disk0/tvdos/bin/taut_fileop.js index 023e671..dae4bfc 100644 --- a/assets/disk0/tvdos/bin/taut_fileop.js +++ b/assets/disk0/tvdos/bin/taut_fileop.js @@ -20,7 +20,7 @@ const PANEL_H = SCRH - PANEL_Y const colStatus = 253 const colContent = 240 -const colHdr = 239 +const colHdr = 230 function drawFileOpContents(wo) { for (let y = PANEL_Y; y < SCRH; y++) { diff --git a/assets/disk0/tvdos/bin/taut_instredit.js b/assets/disk0/tvdos/bin/taut_instredit.js index 2f4b77c..c2ac231 100644 --- a/assets/disk0/tvdos/bin/taut_instredit.js +++ b/assets/disk0/tvdos/bin/taut_instredit.js @@ -20,7 +20,7 @@ const PANEL_H = SCRH - PANEL_Y const colStatus = 253 const colContent = 240 -const colHdr = 239 +const colHdr = 230 function drawInstEditContents(wo) { for (let y = PANEL_Y; y < SCRH; y++) { diff --git a/assets/disk0/tvdos/bin/taut_sampleedit.js b/assets/disk0/tvdos/bin/taut_sampleedit.js index b7326a5..b14cd69 100644 --- a/assets/disk0/tvdos/bin/taut_sampleedit.js +++ b/assets/disk0/tvdos/bin/taut_sampleedit.js @@ -20,7 +20,7 @@ const PANEL_H = SCRH - PANEL_Y const colStatus = 253 const colContent = 240 -const colHdr = 239 +const colHdr = 230 function drawSampleEditContents(wo) { for (let y = PANEL_Y; y < SCRH; y++) { diff --git a/assets/disk0/tvdos/bin/tautfont.kra b/assets/disk0/tvdos/bin/tautfont.kra index 18b77d2..23865b3 100644 --- a/assets/disk0/tvdos/bin/tautfont.kra +++ b/assets/disk0/tvdos/bin/tautfont.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:004e691f241934431cefff2a40ca305ee73cf0ecbae9b8a8d284d24ac96e774d -size 119147 +oid sha256:c247517a29534355562e212b690498e4045eb9ac6d83823d6afecc88c9a161b7 +size 128494 diff --git a/assets/disk0/tvdos/bin/tautfont_high.chr b/assets/disk0/tvdos/bin/tautfont_high.chr index 5245389..763cda2 100644 Binary files a/assets/disk0/tvdos/bin/tautfont_high.chr and b/assets/disk0/tvdos/bin/tautfont_high.chr differ