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.

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

Jump to bottom

fix for html notes being copied to new token dialog text area #4055

Merged
merged 1 commit into from
May 11, 2023
Merged

fix for html notes being copied to new token dialog text area #4055

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
8 changes: 5 additions & 3 deletions src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/EditTokenDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,13 @@ public void bind(final Token token) {
// ICON
getTokenIconPanel().setImageId(token.getImageAssetId());

// NOTES
getGMNotesEditor().setText(token.getGMNotes());
// NOTES, GM NOTES. Due to the way things happen on different gui threads, the type must be set
// before the text
// otherwise the wrong values can get populated when the tab change listener fires.
getGMNotesEditor().setTextType(token.getGmNotesType());
getPlayerNotesEditor().setText(token.getNotes());
getGMNotesEditor().setText(token.getGMNotes());
getPlayerNotesEditor().setTextType(token.getNotesType());
getPlayerNotesEditor().setText(token.getNotes());

// TYPE
getTypeCombo().setSelectedItem(token.getType());
Expand Down