Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HOP-4512, HOP-4513, HOP-4514 #1758

Merged
merged 3 commits into from
Oct 27, 2022
+15 −15
Merged

HOP-4512, HOP-4513, HOP-4514 #1758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90731ad
HOP-4512 : Dragged actions and transform are positioned incorrectly
mattcasters Oct 27, 2022
2a28b4a
HOP-4513 : Update Eclipse RAP to version 3.22
mattcasters Oct 27, 2022
50d7809
HOP-4514 : Transform/Action names are rendered in the wrong color whe…
mattcasters Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rap/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</parent>

<properties>
<rap.version>3.21.0</rap.version>
<rap.version>3.22.0</rap.version>
</properties>


Expand Down
14 changes: 7 additions & 7 deletions rap/src/main/resources/org/apache/hop/ui/hopgui/canvas-dark.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ let handleEvent = function (event) {
const notes = event.widget.getData("notes");
const props = event.widget.getData("props");
const svg = event.widget.getData("svg");
const magnification = props.magnification;
const magnification = props.magnification/0.75;
const gridSize = props.gridsize;
const iconSize = props.iconsize;

Expand Down Expand Up @@ -88,12 +88,12 @@ let handleEvent = function (event) {
} else {
// Clear the canvas
gc.rect(0, 0, gc.canvas.width / magnification, gc.canvas.height / magnification);
gc.fillStyle = 'dark-gray';
gc.fillStyle = 'rgb(50, 50, 50)';
gc.fill();

// Draw grids
if (gridSize > 1) {
gc.fillStyle = 'light-gray';
gc.fillStyle = 'rgb(210, 210, 210)';
gc.beginPath();
gc.setLineDash([1, gridSize - 1]);
// vertical grid
Expand All @@ -108,7 +108,7 @@ let handleEvent = function (event) {
}
gc.stroke();
gc.setLineDash([]);
gc.fillStyle = 'dark-gray';
gc.fillStyle = 'rgb(50, 50, 50)';
}

// Draw hops
Expand Down Expand Up @@ -155,13 +155,13 @@ let handleEvent = function (event) {
gc.strokeStyle = 'rgb(61, 99, 128)'; //colorCrystalText
}
drawRoundRectangle(gc, x - 1, y - 1, iconSize + 1, iconSize + 1, 8, 8, false);
gc.strokeStyle = 'light-gray';
gc.strokeStyle = 'rgb(210, 210, 210)';
gc.lineWidth = 1;

// Draw node name
gc.fillStyle = 'light-gray';
gc.fillStyle = 'rgb(210, 210, 210)';
gc.fillText(key, x + iconSize / 2 - gc.measureText(key).width / 2, y + iconSize + 7);
gc.fillStyle = 'dark-gray';
gc.fillStyle = 'rgb(50, 50, 50)';
}

// Draw notes
Expand Down
14 changes: 7 additions & 7 deletions rap/src/main/resources/org/apache/hop/ui/hopgui/canvas-light.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const handleEvent = function (event) {
const notes = event.widget.getData("notes");
const props = event.widget.getData("props");
const svg = event.widget.getData("svg");
const magnification = props.magnification;
const magnification = props.magnification/0.75;
const gridSize = props.gridsize;
const iconSize = props.iconsize;

Expand Down Expand Up @@ -89,12 +89,12 @@ const handleEvent = function (event) {
} else {
// Clear the canvas
gc.rect(0, 0, gc.canvas.width / magnification, gc.canvas.height / magnification);
gc.fillStyle = 'light-gray';
gc.fillStyle = 'rgb(210, 210, 210)';
gc.fill();

// Draw grids
if (gridSize > 1) {
gc.fillStyle = 'dark-gray';
gc.fillStyle = 'rgb(50, 50, 50)';
gc.beginPath();
gc.setLineDash([1, gridSize - 1]);
// vertical grid
Expand All @@ -109,7 +109,7 @@ const handleEvent = function (event) {
}
gc.stroke();
gc.setLineDash([]);
gc.fillStyle = 'light-gray';
gc.fillStyle = 'rgb(210, 210, 210)';
}

// Draw hops
Expand Down Expand Up @@ -157,13 +157,13 @@ const handleEvent = function (event) {
gc.strokeStyle = 'rgb(61, 99, 128)'; //colorCrystalText
}
drawRoundRectangle(gc, x - 1, y - 1, iconSize + 1, iconSize + 1, 8, 8, false);
gc.strokeStyle = 'dark-gray';
gc.strokeStyle = 'rgb(50, 50, 50)';
gc.lineWidth = 1;

// Draw node name
gc.fillStyle = 'dark-gray';
gc.fillStyle = 'rgb(50, 50, 50)';
gc.fillText(key, x + iconSize / 2 - gc.measureText(key).width / 2, y + iconSize + 7);
gc.fillStyle = 'light-gray';
gc.fillStyle = 'rgb(210, 210, 210)';
}

// Draw notes
Expand Down