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

Restrict playing notes on the keyboard of the Piano Roll editor to left-clicks. #3771

Merged
merged 1 commit into from
Nov 15, 2017
Merged

Restrict playing notes on the keyboard of the Piano Roll editor to left-clicks. #3771

merged 1 commit into from
Nov 15, 2017

Conversation

Sawuare
Copy link
Member

@Sawuare Sawuare commented Aug 20, 2017

This will restrict playing notes on the keyboard of the Piano Roll editor to left-clicks, so middle-clicking a key will not play its note.
Also, left-clicking a key and dragging up or down will play the keys that were dragged over, but middle-clicking doesn't, it just sticks to the note that was middle-clicked on.

…ft-clicks.

This will restrict playing notes on the keyboard of the Piano Roll editor to left-clicks, so middle-clicking a key will not play its note.
@Sawuare
Copy link
Member Author

Sawuare commented Aug 20, 2017

I forgot that LMMS:stable-1.2 is for bug fixes concerning the 1.2 release. 😅
Is there a way to change where my commit will be merged into, other than closing this pull request and opening another one?
I want the commit to be merged into LMMS:Master instead of LMMS:stable-1.2 because that would be more appropriate.

@tresf tresf changed the base branch from stable-1.2 to master August 20, 2017 17:08
@tresf tresf changed the base branch from master to stable-1.2 August 20, 2017 17:08
@tresf
Copy link
Member

tresf commented Aug 20, 2017

I want the commit to be merged into LMMS:Master instead of LMMS:stable-1.2 because that would be more appropriate.

I tried to switch it but weird stuff happens. Probably best to open a new PR.

@Umcaruje
Copy link
Member

You can probably do this:

# Soft reset the branch
git reset --soft stable-1.2
# Stash the changes
git stash
# Hard reset to master
git reset --hard upstream/master
# Bring back the stashed changes
git stash pop
# Force push
git push -f

Then set the base branch to master

P.S. I'd backup the work just in case but this should work

@Sawuare
Copy link
Member Author

Sawuare commented Aug 21, 2017

I just forked LMMS/lmms and did these small changes online. I don't have a local copy of the repo.
@Umcaruje I think the commands you mentioned will work if I have a local copy. Is there a way to set Sawuare/lmms to be like my working directory while I don't have a local copy of it, so I can execute these commands?

@zonkmachine
Copy link
Member

I just forked LMMS/lmms and did these small changes online. I don't have a local copy of the repo.

But have you compiled it on your own machine at all? Working from the online editor won't really work as you need to actually compile and test your changes yourself.

Is there a way to set Sawuare/lmms to be like my working directory while I don't have a local copy of it, so I can execute these commands?

No. You should clone Sawuare/lmms as described here and then add build and target directories and compile it as described here.

Before you start working on something you have to create a separate branch.
Something like:
git checkout master
git checkout -b restrictnotes

Then you can either push over this PR or close this one and open a new one (easier).

@Sawuare
Copy link
Member Author

Sawuare commented Aug 25, 2017

@zonkmachine

I never compiled it on my machine. I worked from the online editor because the changes I made were very small that I didn't think they would need testing.

The problem is that I don't have access to my machine right now. :(
I will clone, create a seperate branch, compile, test and push over this PR as soon as I get access to my machine. ;)

@PhysSong PhysSong changed the base branch from stable-1.2 to master August 28, 2017 09:12
@PhysSong
Copy link
Member

Now the base branch can be switched safely thanks to 12edb58.

@Sawuare
Copy link
Member Author

Sawuare commented Sep 21, 2017

Tested this and it works. Merge?

@Umcaruje Umcaruje added this to the 1.3.0 milestone Oct 2, 2017
@tresf tresf merged commit c9e5d3a into LMMS:master Nov 15, 2017
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
…ft-clicks. (LMMS#3771)

Restrict playing notes on the keyboard of the Piano Roll editor to left-clicks
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.

5 participants