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.

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

[NETBEANS-1252] Fix shifted cursor in output window with GDK_SCALE=2 #878

Merged
merged 1 commit into from Oct 17, 2018
Merged

[NETBEANS-1252] Fix shifted cursor in output window with GDK_SCALE=2 #878

merged 1 commit into from Oct 17, 2018

Conversation

hlavki
Copy link
Contributor

@hlavki hlavki commented Sep 14, 2018

Remove ExtPlainView methods viewToModel() & modelToView() and use those from parent.

@matthiasblaesing
Copy link
Contributor

The change itself looks sane. The removed implementation looks like a direct copy from the JDK implementation, so switching to the JDKs default implementation is sane.

I'd like you do adjust the commit though:

  • the summary (first) line of the commit should hold the referenced issue in brackets as first element
  • as the name suggests the first line should give a summary of the change (why was it done)
  • then an empty line should follow
  • the rest of the message should give a reasoning for the change

In this case:

[NETBEANS-1252] Fix shifted cursor in output window with GDK_SCALE=2

Remove custom implementation of #viewToModel and# modelToView methods, ....

You can update the message by amending the commit and doing a force push of the branch the PR is based on.

A final comment: You introduced changes not directly related to the fix (whitespace removal + constant introduction). They are sane, but in general that should not be done. (in this case keep it, as I already looked through it).

@matthiasblaesing
Copy link
Contributor

@hlavki you reacted with a thumbs up - just to be sure - are you planning on updating the commit message?

@hlavki
Copy link
Contributor Author

hlavki commented Sep 20, 2018

@matthiasblaesing, sorry for late answer. I can change commit message. Does it means, that we can close this PR and open new one?

@matthiasblaesing
Copy link
Contributor

There is not the redo the PR. This sequence works:

  • switch your working copy to the branch NETBEANS-1252
  • run git commit --amend
  • update the commit message
  • do a force push git push -f to update the remote branch

The amend option allows you to change the last commit you made. You don't want to make further file changes, but it also allows you to change the commit message.

The force push is necessary as normally a remote head can't be changed/removed and your push will require that.

When the push is done, the PR will reflect the state of the latest state of the NETBEANS-1252 branch.

@lkishalmi
Copy link
Contributor

Changes are looks fine tested on Ubuntu non HiDPI as well it works Ok.
Shall we merge this one?

Remove ExtPlainView methods viewToModel() & modelToView() and use those from parent.
@hlavki
Copy link
Contributor Author

hlavki commented Oct 1, 2018

@matthiasblaesing, done. thanks for hint.

@hlavki hlavki changed the title fix for NETBEANS-1252 [NETBEANS-1252] Fix shifted cursor in output window with GDK_SCALE=2 Oct 15, 2018
@hlavki
Copy link
Contributor Author

hlavki commented Oct 17, 2018

@lkishalmi don't know for whom this question is, but I think there is no problem to merge this.

@lkishalmi lkishalmi merged commit 42b224e into apache:master Oct 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants