Fixes #2

[hecksadecimal]

Changes currPopup to JPopupMenu and implements with the canvas click check to hide the menu when you click elsewhere. Additionally, currPopup is set to Heavyweight mode and added to the Canvas' parent to sidestep some heavyweight/lightweight incompatibility issues.

[monster860]

Please do something about the

Merge remote-tracking branch 'refs/remotes/monster860/master'

commits

[hecksadecimal]

How do you propose I do that? It happens whenever I pull from this repo to get the latest changes.

[monster860]

How to fix having these fucked up merge commits on your master branch:

git fetch monster860
git checkout master
git reset --hard HEAD~<number of merge commits>  (If you have 4 merge commits do git reset --hard HEAD~4
git merge monster860/master --ff-only
git push --force origin master

How to fix having these fucked up merge commis on your Fix-Context branch: (Do this after fixing it on your master branch)

git checkout
git reset --soft HEAD~
git stash
git reset --hard HEAD~2
git merge master
git stash apply
git push --force origin Fix-Context

Do not use the Update from monster860/master button in Github. It sucks balls.

Instead, do this in the command line whenever you want to update

git fetch monster860
git checkout master
git merge monster860/master --ff-only

[monster860]

Oh yeah, I forgot to mention you need to actually commit your changes and then you can reopen this pull request.

[hecksadecimal]

Alrighty. I'm trying your code change suggestions right now.

[hecksadecimal]

Applied and tested the changes. Behaves as expected.