Merge branch 'dev' into users/t-xunguy/file-selection-fix

microsoft · Mar 4, 2020 · dd1d702 · dd1d702
2 parents f5fca46 + 1265ca0
commit dd1d702
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 7 deletions.
diff --git a/src/extension_utils/utils.ts b/src/extension_utils/utils.ts
@@ -553,7 +553,7 @@ export const setupEnv = async (
 ) => {
     const originalpythonExecutablePath = await getCurrentpythonExecutablePath();
     let pythonExecutablePath = originalpythonExecutablePath;
-    let pythonExecutableName: string =
+    const pythonExecutableName: string =
         os.platform() === "win32"
             ? HELPER_FILES.PYTHON_EXE
             : HELPER_FILES.PYTHON;

diff --git a/src/view/components/cpx/CpxImage.tsx b/src/view/components/cpx/CpxImage.tsx
@@ -183,7 +183,7 @@ const initSvgStyle = (svgElement: HTMLElement, brightness: number): void => {
 
     const ab = outerBtn(165, SvgStyle.MB_HEIGHT - 15, "A+B");
     const abtext = svg.child(ab.outer, "text", {
-        class: "sim-text",
+        class: "sim-text-outside",
         x: SvgStyle.BUTTON_TEXT_BASELINE,
         y: SvgStyle.MB_HEIGHT - 18,
     }) as SVGTextElement;

diff --git a/src/view/components/cpx/Cpx_svg_style.tsx b/src/view/components/cpx/Cpx_svg_style.tsx
@@ -141,6 +141,10 @@ export const SVG_STYLE = `
         fill:#fff;
         pointer-events: none; user-select: none;
     }
+    .sim-text-outside{
+        font-size:8px;
+        fill: var(--vscode-descriptionForeground);
+    }
     .sim-text.small {
         font-size:6px;
     }

diff --git a/src/view/components/microbit/MicrobitImage.tsx b/src/view/components/microbit/MicrobitImage.tsx
@@ -3,8 +3,8 @@
 
 import * as React from "react";
 import { VIEW_STATE } from "../../constants";
-import { ViewStateContext } from "../../context";
 import CONSTANTS, { MICROBIT_BUTTON_STYLING_CLASSES } from "../../constants";
+import { ViewStateContext } from "../../context";
 import "../../styles/Microbit.css";
 import { IRefObject, MicrobitSvg } from "./Microbit_svg";
 

diff --git a/src/view/components/microbit/MicrobitSimulator.tsx b/src/view/components/microbit/MicrobitSimulator.tsx
@@ -10,7 +10,7 @@ import StopLogo from "../../svgs/stop_svg";
 import { sendMessage } from "../../utils/MessageUtils";
 import Dropdown from "../Dropdown";
 import ActionBar from "../simulator/ActionBar";
-import { MicrobitImage, BUTTONS_KEYS } from "./MicrobitImage";
+import { BUTTONS_KEYS, MicrobitImage } from "./MicrobitImage";
 
 const DEFAULT_MICROBIT_STATE: IMicrobitState = {
     leds: [

diff --git a/src/view/components/microbit/Microbit_svg.tsx b/src/view/components/microbit/Microbit_svg.tsx
@@ -1778,7 +1778,7 @@ export class MicrobitSvg extends React.Component {
                             fill="#111"
                             style={{ fill: "rgb(17, 17, 17)" }}
                         />
-                        <text x={525} y={340} className="sim-text">
+                        <text x={525} y={340} className="sim-text-outside">
                             A+B
                         </text>
                         <g

diff --git a/src/view/container/device/__snapshots__/Device.spec.tsx.snap b/src/view/container/device/__snapshots__/Device.spec.tsx.snap
@@ -2472,7 +2472,7 @@ exports[`Device component  should render correctly 1`] = `
               }
             />
             <text
-              className="sim-text"
+              className="sim-text-outside"
               x={525}
               y={340}
             >

diff --git a/src/view/styles/Microbit.css b/src/view/styles/Microbit.css
@@ -22,7 +22,10 @@ svg.sim.grayscale {
 .sim-button:active {
     fill: orange;
 }
-
+.sim-text-outside {
+    font-size: 25px;
+    fill: var(--vscode-descriptionForeground);
+}
 .sim-board,
 .sim-display,
 sim-button {