Skip to content

Commit

Permalink
Fixed 3D Text editing bug in On-changed function
Browse files Browse the repository at this point in the history
  • Loading branch information
@codetiger
codetiger committed Jun 21, 2019
1 parent 58db795 commit 26d334a
Show file tree
Hide file tree
Showing 10 changed files with 140 additions and 268 deletions.
8 changes: 4 additions & 4 deletions iyan3d/trunk/Iyan3D_iOS/Iyan3D.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10029,7 +10029,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
COMPRESS_PNG_FILES = NO;
DEVELOPMENT_TEAM = 3MT93EVK96;
Expand All @@ -10056,7 +10056,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.smackall.iyan3dpro;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "74cc7fd5-c7e4-40ae-8354-fad5045525b8";
PROVISIONING_PROFILE_SPECIFIER = "Iyan 3d pro - dist";
PROVISIONING_PROFILE_SPECIFIER = "Iyan 3d pro - dev";
WRAPPER_EXTENSION = app;
};
name = Debug;
Expand All @@ -10067,7 +10067,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
COMPRESS_PNG_FILES = NO;
DEVELOPMENT_TEAM = 3MT93EVK96;
Expand All @@ -10094,7 +10094,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.smackall.iyan3dpro;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "74cc7fd5-c7e4-40ae-8354-fad5045525b8";
PROVISIONING_PROFILE_SPECIFIER = "Iyan 3d pro - dist";
PROVISIONING_PROFILE_SPECIFIER = "Iyan 3d pro - dev";
WRAPPER_EXTENSION = app;
};
name = Release;
Expand Down
4 changes: 2 additions & 2 deletions iyan3d/trunk/Iyan3D_iOS/Iyan3D/Iyan3D-Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>6.1</string>
<string>6.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>6.1.3</string>
<string>6.2.0</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>dbapi-8-emm</string>
Expand Down
93 changes: 22 additions & 71 deletions iyan3d/trunk/Iyan3D_iOS/Iyan3D/TextSelectionSidePanelPhone.xib
View file

Large diffs are not rendered by default.

116 changes: 58 additions & 58 deletions iyan3d/trunk/Iyan3D_iOS/Iyan3D/ui/MainViews/EditorViewControllerPhone@2x.xib
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion iyan3d/trunk/Iyan3D_iOS/Iyan3D/ui/MainViews/TextSelectionSidePanel.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ - (void)unselectAll
- (IBAction)inputTextChangedAction:(id)sender {
if(isCanceled) return NO;
[self load3dText];
[_inputText resignFirstResponder];
// [_inputText resignFirstResponder];
}

- (IBAction)bevalChangeAction:(id)sender {
Expand Down
53 changes: 5 additions & 48 deletions iyan3d/trunk/Iyan3D_iOS/Iyan3D/ui/MainViews/TextSelectionSidePanel.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,21 @@
<outlet property="boneSwitch" destination="axZ-uQ-2OO" id="px9-d0-HBw"/>
<outlet property="cancelBtn" destination="c9v-9A-XSr" id="43x-kw-hEK"/>
<outlet property="collectionView" destination="P2e-gr-fZj" id="Sz1-ag-nUf"/>
<outlet property="dummyLeft" destination="uZZ-do-Rny" id="aXj-XJ-QJT"/>
<outlet property="dummyRight" destination="LPq-bb-X0L" id="9Vh-sm-Lnk"/>
<outlet property="fontTab" destination="X3h-3Z-EP7" id="Zpy-ye-qkS"/>
<outlet property="inputText" destination="CyO-w9-dd0" id="Y4K-HK-YZu"/>
<outlet property="noFontMessageLable" destination="WZA-PG-YhB" id="2zP-YN-X2R"/>
<outlet property="titleLabel" destination="xGM-i8-p5U" id="NVK-Ed-33f"/>
<outlet property="titleView" destination="kan-bt-NfR" id="fNJ-xy-BnF"/>
<outlet property="view" destination="D2q-EF-2et" id="T7L-vs-Kw9"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view tag="1" contentMode="scaleToFill" id="D2q-EF-2et">
<rect key="frame" x="0.0" y="0.0" width="300" height="709"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" id="kcJ-9n-BbN">
<rect key="frame" x="0.0" y="0.0" width="300" height="79"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter Text" textAlignment="natural" minimumFontSize="17" id="CyO-w9-dd0">
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter Text" textAlignment="natural" minimumFontSize="17" clearButtonMode="always" id="CyO-w9-dd0">
<rect key="frame" x="46" y="15" width="209" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" hint="Enter your text here." identifier="3"/>
Expand Down Expand Up @@ -68,8 +63,8 @@
<color key="backgroundColor" red="0.050980392156862744" green="0.050980392156862744" blue="0.050980392156862744" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" indicatorStyle="white" dataMode="none" id="P2e-gr-fZj">
<rect key="frame" x="0.0" y="159" width="300" height="490"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<rect key="frame" x="0.0" y="131" width="300" height="518"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="18" minimumInteritemSpacing="10" id="A3i-Jx-Dl5">
<size key="itemSize" width="72" height="80"/>
Expand All @@ -84,7 +79,7 @@
</collectionView>
<view contentMode="scaleToFill" id="ImC-qF-OtT">
<rect key="frame" x="0.0" y="650" width="300" height="60"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="c9v-9A-XSr">
<rect key="frame" x="8" y="8" width="110" height="40"/>
Expand Down Expand Up @@ -137,51 +132,13 @@
</subviews>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<segmentedControl hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" id="X3h-3Z-EP7">
<rect key="frame" x="4" y="123" width="81" height="29"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<segments>
<segment title="Font Store"/>
<segment title="My Fonts"/>
</segments>
<color key="tintColor" red="0.047058823530000002" green="0.4941176471" blue="0.47843137250000001" alpha="1" colorSpace="calibratedRGB"/>
<connections>
<action selector="fontStoreTapChangeAction:" destination="-1" eventType="valueChanged" id="Rm8-TG-DQQ"/>
</connections>
</segmentedControl>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Font files found. 
Add .ttf or .otf Font files in
 Document Directory." textAlignment="center" lineBreakMode="wordWrap" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="WZA-PG-YhB">
<rect key="frame" x="4" y="346" width="288" height="115"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" id="LPq-bb-X0L">
<rect key="frame" x="232" y="131" width="17" height="28"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" hint="Toggle between store fonts and the fonts you have imported." identifier="3"/>
</view>
<view contentMode="scaleToFill" id="uZZ-do-Rny">
<rect key="frame" x="45" y="131" width="19" height="28"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" hint="Toggle between store fonts and the fonts you have imported." identifier="1"/>
</view>
<view contentMode="scaleToFill" id="kan-bt-NfR">
<rect key="frame" x="117" y="128" width="81" height="28"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="My Fonts" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xGM-i8-p5U">
<rect key="frame" x="2" y="4" width="77" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.047058823530000002" green="0.4941176471" blue="0.47843137250000001" alpha="1" colorSpace="calibratedRGB"/>
</view>
</subviews>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" hint="Choose a font to preview 3D text." identifier="3"/>
Expand Down

0 comments on commit 26d334a

Please sign in to comment.