Skip to content
New issue

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

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

Already on GitHub? # to your account

feat: add mouseX and mouseY #122

Merged
merged 1 commit into from
Jun 16, 2017
Merged

feat: add mouseX and mouseY #122

merged 1 commit into from
Jun 16, 2017

Conversation

hawkingrei
Copy link
Contributor

@hawkingrei hawkingrei commented Jun 15, 2017

😈 I add new keywords mouseX and mouseY. You can test by the following R code

draw <- function() {
    background(as.integer(204))
    line(mouseX, mouseY, 80, mouseY);
}

@gaocegege
Copy link
Member

Hi, there is one conflicting file, please resolve it 😄

this.renjinEngine.put("width", width);
this.renjinEngine.put("height", height);
this.renjinEngine.put("displayWidth", displayWidth);
this.renjinEngine.put("displayHeight", displayHeight);
// this.renjinEngine.put("focused", focused);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the conflict is caused by this statement

Copy link
Member

@jeremydouglass jeremydouglass Jun 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I enabled that line in 912d23b -- before, processing$focused worked, but focused did not. Now focused works. We should be able to merge the new mouseX / mouseY code and leave that line enabled -- unless I'm misunderstanding something.

Copy link
Contributor Author

@hawkingrei hawkingrei Jun 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolved

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jeremydouglass I think you are right 😄

And LGTM

@gaocegege
Copy link
Member

LGTM

@gaocegege gaocegege merged commit 786ef8f into processing-r:master Jun 16, 2017
@gaocegege gaocegege modified the milestone: Evaluation 1 Jun 22, 2017
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants