v0.11.0 - round two

amcolash · Jul 20, 2021 · 00b9eb8 · 00b9eb8
1 parent 3566054
commit 00b9eb8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,11 +5,11 @@
 ### Added
 
 - Support for multi-page music (with pdf intermediate) [Resolves #1]
-- Nicer debugging features (clicking home will ignore preset data once)
+- Nicer debugging features (clicking home will ignore preset data once, debugger for webview)
 
 ### Fixed
 
-- Download button not always showing [Fixes #2]
+- Download button not always showing (and not being able to click properly) [Fixes #2]
 - Hopefully fixed logging delays for the console viewer
 
 ## 0.10.0 (2021-06-10)

diff --git a/src/main/preload.js b/src/main/preload.js
@@ -29,6 +29,7 @@ window.addButton = function () {
     button.style.marginLeft = '10px';
     button.style.marginTop = '6px';
     button.style.border = 'none';
+    button.style.zIndex = 1;
 
     buttons.appendChild(button);
   } else {

diff --git a/src/renderer/App.jsx b/src/renderer/App.jsx
@@ -5,7 +5,7 @@ import { sampleData } from '../common/sampleData';
 import { Status } from './Status';
 import { Webview } from './Webview';
 
-const useSampleData = true && !sessionStorage.getItem('flowkey-home');
+const useSampleData = false && !sessionStorage.getItem('flowkey-home');
 
 export const App = () => {
   const [data, setData] = useState(isDevelopment && useSampleData ? sampleData.AllOfMe : undefined);

diff --git a/src/renderer/Score.jsx b/src/renderer/Score.jsx
@@ -141,7 +141,7 @@ export const Score = (props) => {
         </div>
 
         <button style={{ margin }} onClick={() => setShowIntermediate(!showIntermediate)}>
-          View Intermediate Score
+          {`${showIntermediate ? 'Hide' : 'View'} Intermediate Score`}
           <Eye style={{ marginLeft: 8 }} />
         </button>
       </div>

diff --git a/src/renderer/Webview.jsx b/src/renderer/Webview.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { ipcRenderer } from 'electron';
-import { ArrowLeft, ArrowRight, Home } from 'react-feather';
+import { ArrowLeft, ArrowRight, Cpu, Home } from 'react-feather';
 import { Colors } from '../common/constants';
 
 const DEBUG = false;
@@ -71,6 +71,9 @@ export const Webview = (props) => {
         >
           {displayUrl}
         </div>
+        <button style={{ padding: 3, margin: 3 }} onClick={() => webview.current.openDevTools()}>
+          <Cpu height="20" width="20" />
+        </button>
       </div>
       <webview src={baseUrl} style={{ width: '100%', height: '100%' }} ref={webview} preload={'file:///' + preload} />
     </div>