Skip to content

Commit

Permalink
Improve appearance of Wheel Menu (#2175)
Browse files Browse the repository at this point in the history 
* Remove rectangle background of Pie menu

* Replace wheel close character "x" by "times"

* Replace wheel close character "X" by "×" (times)

* Remove unnecessary element
  • Loading branch information
@meganindya
meganindya authored Mar 25, 2020
1 parent f494830 commit fd6dab9
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 49 deletions.
68 changes: 28 additions & 40 deletions images/gray.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 9 additions & 9 deletions js/block.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4525,7 +4525,7 @@ function Block(protoblock, blocks, overrideName) {
this._exitWheel.sliceSelectedPathCustom = this._exitWheel.slicePathCustom;
this._exitWheel.sliceInitPathCustom = this._exitWheel.slicePathCustom;
this._exitWheel.clickModeRotate = false;
this._exitWheel.createWheel(["x", " "]);
this._exitWheel.createWheel(["×", " "]);

if (!custom) {
this._accidentalsWheel.colors =
Expand Down Expand Up @@ -4924,7 +4924,7 @@ function Block(protoblock, blocks, overrideName) {
this._exitWheel.sliceSelectedPathCustom = this._exitWheel.slicePathCustom;
this._exitWheel.sliceInitPathCustom = this._exitWheel.slicePathCustom;
this._exitWheel.clickModeRotate = false;
this._exitWheel.createWheel(["x", " "]);
this._exitWheel.createWheel(["×", " "]);

this._octavesWheel.colors = platformColor.octavesWheelcolors;
this._octavesWheel.slicePathFunction = slicePath().DonutSlice;
Expand Down Expand Up @@ -5197,7 +5197,7 @@ function Block(protoblock, blocks, overrideName) {
this._exitWheel.sliceSelectedPathCustom = this._exitWheel.slicePathCustom;
this._exitWheel.sliceInitPathCustom = this._exitWheel.slicePathCustom;
this._exitWheel.clickModeRotate = false;
this._exitWheel.createWheel(["x", " "]);
this._exitWheel.createWheel(["×", " "]);

var that = this;

Expand Down Expand Up @@ -5366,7 +5366,7 @@ function Block(protoblock, blocks, overrideName) {
this._exitWheel.sliceSelectedPathCustom = this._exitWheel.slicePathCustom;
this._exitWheel.sliceInitPathCustom = this._exitWheel.slicePathCustom;
this._exitWheel.clickModeRotate = false;
this._exitWheel.createWheel(["x", " "]);
this._exitWheel.createWheel(["×", " "]);

var tabsLabels = [];
for (var i = 0; i < WHEELVALUES.length; i++) {
Expand Down Expand Up @@ -5620,7 +5620,7 @@ function Block(protoblock, blocks, overrideName) {
this._exitWheel.sliceSelectedPathCustom = this._exitWheel.slicePathCustom;
this._exitWheel.sliceInitPathCustom = this._exitWheel.slicePathCustom;
this._exitWheel.clickModeRotate = false;
this._exitWheel.createWheel(["x", "-", "+"]);
this._exitWheel.createWheel(["×", "-", "+"]);

var that = this;

Expand Down Expand Up @@ -5965,7 +5965,7 @@ function Block(protoblock, blocks, overrideName) {
this._exitWheel.sliceSelectedPathCustom = this._exitWheel.slicePathCustom;
this._exitWheel.sliceInitPathCustom = this._exitWheel.slicePathCustom;
this._exitWheel.clickModeRotate = false;
this._exitWheel.createWheel(["x", " "]);
this._exitWheel.createWheel(["×", " "]);

var that = this;

Expand Down Expand Up @@ -6377,7 +6377,7 @@ function Block(protoblock, blocks, overrideName) {
this._exitWheel.sliceSelectedPathCustom = this._exitWheel.slicePathCustom;
this._exitWheel.sliceInitPathCustom = this._exitWheel.slicePathCustom;
this._exitWheel.clickModeRotate = false;
this._exitWheel.createWheel(["x", " "]);
this._exitWheel.createWheel(["×", " "]);

var that = this;

Expand Down Expand Up @@ -6601,7 +6601,7 @@ function Block(protoblock, blocks, overrideName) {
this._exitWheel.sliceSelectedPathCustom = this._exitWheel.slicePathCustom;
this._exitWheel.sliceInitPathCustom = this._exitWheel.slicePathCustom;
this._exitWheel.clickModeRotate = false;
this._exitWheel.createWheel(["x", " "]);
this._exitWheel.createWheel(["×", " "]);

var that = this;

Expand Down Expand Up @@ -6874,7 +6874,7 @@ function Block(protoblock, blocks, overrideName) {
this._exitWheel.sliceSelectedPathCustom = this._exitWheel.slicePathCustom;
this._exitWheel.sliceInitPathCustom = this._exitWheel.slicePathCustom;
this._exitWheel.clickModeRotate = false;
this._exitWheel.createWheel(["x", "▶"]); // imgsrc:header-icons/play-button.svg']);
this._exitWheel.createWheel(["×", "▶"]); // imgsrc:header-icons/play-button.svg']);

var that = this;

Expand Down

0 comments on commit fd6dab9

Please sign in to comment.