Refactor/concept text support #78
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
the names are more descriptive. also commented out all the code related to the textField.
- `showTextView(inRect:text:)` - `showTextView(atPoint:text:)` - `dismissTextView()` so now they work with a textView instead of a textField.
|
closes #58 |
`textView.attributedString()` returns an object with reference semantics, that is assigned to the `concept`, then the same string gets set to `””` in `dismissTextView`, but for the reference semantics, then `concept.attributedStringValue` is also `””`. This commit fixes that.
Either to given `contrainedSize` or to the `maxSize` for the visible rect in the point of the rect.
if so, adjust the mode for the concept. so in this way, constrained text in the textView will keep being constrained on the concept.
fespinoza
changed the title
fespinoza
commented
Sep 4, 2017
| conceptMode = .textBased | ||
| } | ||
|
|
||
| dismissTextView() |
There was a problem hiding this comment.
this logic is duplicated.
| // if the concept mode is | ||
| // constrained, then pass the constraint | ||
| // if not don't pass anything and it will be contrained to max visible area | ||
| var constrainedSize: NSSize? |
There was a problem hiding this comment.
this can go in the model
| textField.allowsEditingTextAttributes = true | ||
| return textField | ||
| // MARK: - Text Handling | ||
| let textContainer = NSTextContainer(size: NSSize(width: 300, height: 300)) |
LinkedIdeas/StateManager.swift
Outdated
| @@ -209,4 +238,13 @@ class StateManager { | |||
| ) | |||
| } | |||
| } | |||
|
|
|||
| // TODO: remove this function | |||
There was a problem hiding this comment.
revisit the logic for possible states
the previous implementation relied in an array of `possibleStates` of type `[CanvasState]`, but that made me create instances of that enum, even with dummy associated values, becuase they are non optionals, and they shoudln't be. Now, each transition method has a internal `isValidTransition(CanvasState) -> Bool` function to dermine the valid transitions, which internally they rely on switch statements to return this boolean, then I get type safety and compiler help when introducing new states without having to do the tricks i did before.
the textView methods depend on the presence of the scrollView, which is a force unwrapped optional as it's an IBOutlet in the view controller.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
showTextView(inRect:text:)showTextView(atPoint:text:)dismissTextView()so now they work with a textView instead of a textField.
TODO