Skip to content

Fix UITextBox to play sounds correctly when using C, V, or X keys #984

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

Open
r6915ee wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix UITextBox to play sounds correctly when using C, V, or X keys #984

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 16 additions & 7 deletions source/funkin/editors/ui/UITextBox.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,32 +201,41 @@ class UITextBox extends UISliceSprite implements IUIFocusable {
case END:
position = label.text.length;
case V:
UIState.playEditorSound(Flags.DEFAULT_EDITOR_PASTE_SOUND);
// Hey lj here, fixed copying because before we checked if the modifier was left or right ctrl
// but somehow it gave a int outside of the KeyModifier's range :sob:
// apparently there is a boolean that just checks for you. yw :D

// if we are not holding ctrl, ignore
if (!modifier.ctrlKey)
if (!modifier.ctrlKey) {
UIState.playEditorSound(Flags.DEFAULT_EDITOR_TEXTTYPE_SOUND);
return;
}

UIState.playEditorSound(Flags.DEFAULT_EDITOR_PASTE_SOUND);

// we pasting
var data:String = Clipboard.generalClipboard.getData(TEXT_FORMAT);
if (data != null)
onTextInput(data);
case C:
UIState.playEditorSound(Flags.DEFAULT_EDITOR_COPY_SOUND);
// if we are not holding ctrl, ignore
if (!modifier.ctrlKey)
if (!modifier.ctrlKey) {
UIState.playEditorSound(Flags.DEFAULT_EDITOR_TEXTTYPE_SOUND);
return;
}

UIState.playEditorSound(Flags.DEFAULT_EDITOR_COPY_SOUND);

// copying
Clipboard.generalClipboard.setData(TEXT_FORMAT, label.text);
case X:
UIState.playEditorSound(Flags.DEFAULT_EDITOR_CUT_SOUND);

// if we are not holding ctrl, ignore
if (!modifier.ctrlKey)
if (!modifier.ctrlKey) {
UIState.playEditorSound(Flags.DEFAULT_EDITOR_TEXTTYPE_SOUND);
return;
}

UIState.playEditorSound(Flags.DEFAULT_EDITOR_CUT_SOUND);

// cutting
Clipboard.generalClipboard.setData(TEXT_FORMAT, label.text);
Expand Down