Skip to content

Commit

Permalink
Merge pull request #58 from Asana/fix-issues
Browse files Browse the repository at this point in the history
Fix various bugs
  • Loading branch information
stevelandeyasana authored Jun 18, 2020
2 parents 12efe88 + 19dcaa9 commit b397b65
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Drawsana.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "$(SRCROOT)/Drawsana/_Support/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -740,7 +740,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "$(SRCROOT)/Drawsana/_Support/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -803,7 +803,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = K34Z59STMC;
INFOPLIST_FILE = "$(SRCROOT)/Drawsana Demo/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -825,7 +825,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = K34Z59STMC;
INFOPLIST_FILE = "$(SRCROOT)/Drawsana Demo/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
3 changes: 3 additions & 0 deletions Drawsana/DrawsanaView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,9 @@ public class DrawsanaView: UIView {
public override func layoutSubviews() {
super.layoutSubviews()
drawing.size = frame.size

// Buffers may not be sized correctly
redrawAbsolutelyEverything()
}

// MARK: API
Expand Down
5 changes: 4 additions & 1 deletion Drawsana/Tools/Implementations/Text tool/TextTool.swift
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,10 @@ public class TextTool: NSObject, DrawingTool {

func updateTextView() {
guard let shape = selectedShape else { return }
editingView.textView.text = shape.text
// Resetting text while markedTextRange exists breaks some keyboards.
if editingView.textView.markedTextRange == nil {
editingView.textView.text = shape.text
}
editingView.textView.font = shape.font
editingView.textView.textColor = shape.fillColor
editingView.bounds = shape.boundingRect
Expand Down
2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Drawsana might work for you!

[Docs](https://asana.github.io/Drawsana)

_Like what you see? [Come work with us!](https://asana.com/jobs/apply/874145/software-engineerios)_
_Like what you see? [Come work with us!](https://asana.com/jobs/all#)_

## Features

Expand Down

0 comments on commit b397b65

Please sign in to comment.