c_meyer/pxt-calliope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #485 from Microsoft/bug_1557_fix

Browse Source 
Add 'user-select: none' to sim elements that shouldn't be draggable
This commit is contained in:
Caitlin Hennessy 2017-08-02 11:47:20 -07:00 committed by GitHub
commit 8e426eddb7
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sim/visuals/microbit.ts
View File

@ -136,6 +136,14 @@ namespace pxsim.visuals {
.sim-wireframe .sim-board { .sim-wireframe .sim-board {
stroke-width: 2px; stroke-width: 2px;
} }
.no-drag {
user-drag: none;
user-select: none;
-moz-user-select: none;
-webkit-user-drag: none;
-webkit-user-select: none;
-ms-user-select: none;
}
`; `;
const MB_HIGHCONTRAST = ` const MB_HIGHCONTRAST = `
.sim-led { .sim-led {
@ -442,7 +450,7 @@ namespace pxsim.visuals {
let gid = "gradient-thermometer"; let gid = "gradient-thermometer";
this.thermometerGradient = svg.linearGradient(this.defs, gid); this.thermometerGradient = svg.linearGradient(this.defs, gid);
this.thermometer = <SVGRectElement>svg.child(this.g, "rect", { this.thermometer = <SVGRectElement>svg.child(this.g, "rect", {
class: "sim-thermometer", class: "sim-thermometer no-drag",
x: 120, x: 120,
y: 110, y: 110,
width: 20, width: 20,
@ -542,7 +550,7 @@ namespace pxsim.visuals {
let r = 35; let r = 35;
this.lightLevelButton = svg.child(this.g, "circle", { this.lightLevelButton = svg.child(this.g, "circle", {
cx: `50px`, cy: `${cy}px`, r: `${r}px`, cx: `50px`, cy: `${cy}px`, r: `${r}px`,
class: 'sim-light-level-button', class: 'sim-light-level-button no-drag',
fill: `url(#${gid})` fill: `url(#${gid})`
}) as SVGCircleElement; }) as SVGCircleElement;
let pt = this.element.createSVGPoint(); let pt = this.element.createSVGPoint();
@ -638,7 +646,7 @@ namespace pxsim.visuals {
} }
// head // head
this.head = <SVGGElement>svg.child(this.g, "g", { class: "sim-head" }); this.head = <SVGGElement>svg.child(this.g, "g", { class: "sim-head no-drag" });
svg.child(this.head, "circle", { cx: 258, cy: 75, r: 100, fill: "transparent" }) svg.child(this.head, "circle", { cx: 258, cy: 75, r: 100, fill: "transparent" })
this.logos.push(svg.path(this.head, "sim-theme sim-theme-glow", "M269.9,50.2L269.9,50.2l-39.5,0v0c-14.1,0.1-24.6,10.7-24.6,24.8c0,13.9,10.4,24.4,24.3,24.7v0h39.6c14.2,0,24.8-10.6,24.8-24.7C294.5,61,284,50.3,269.9,50.2 M269.7,89.2L269.7,89.2l-39.3,0c-7.7-0.1-14-6.4-14-14.2c0-7.8,6.4-14.2,14.2-14.2h39.1c7.8,0,14.2,6.4,14.2,14.2C283.9,82.9,277.5,89.2,269.7,89.2")); this.logos.push(svg.path(this.head, "sim-theme sim-theme-glow", "M269.9,50.2L269.9,50.2l-39.5,0v0c-14.1,0.1-24.6,10.7-24.6,24.8c0,13.9,10.4,24.4,24.3,24.7v0h39.6c14.2,0,24.8-10.6,24.8-24.7C294.5,61,284,50.3,269.9,50.2 M269.7,89.2L269.7,89.2l-39.3,0c-7.7-0.1-14-6.4-14-14.2c0-7.8,6.4-14.2,14.2-14.2h39.1c7.8,0,14.2,6.4,14.2,14.2C283.9,82.9,277.5,89.2,269.7,89.2"));
this.logos.push(svg.path(this.head, "sim-theme sim-theme-glow", "M230.6,69.7c-2.9,0-5.3,2.4-5.3,5.3c0,2.9,2.4,5.3,5.3,5.3c2.9,0,5.3-2.4,5.3-5.3C235.9,72.1,233.5,69.7,230.6,69.7")); this.logos.push(svg.path(this.head, "sim-theme sim-theme-glow", "M230.6,69.7c-2.9,0-5.3,2.4-5.3,5.3c0,2.9,2.4,5.3,5.3,5.3c2.9,0,5.3-2.4,5.3-5.3C235.9,72.1,233.5,69.7,230.6,69.7"));