Skip to content

Commit a6808a3

Browse files
committed
Merge branch 'develop'
2 parents 8879ce7 + 4f0d30a commit a6808a3

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

IINA+.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@
872872
);
873873
runOnlyForDeploymentPostprocessing = 0;
874874
shellPath = /bin/sh;
875-
shellScript = "#!/bin/bash\nBUILD_NUMBER=`date +%y%m%d%H`\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $BUILD_NUMBER\" \"${TARGET_BUILD_DIR}\"/\"${INFOPLIST_PATH}\"\n";
875+
shellScript = "#!/bin/bash\nBUILD_NUMBER=$(date +%s)\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $BUILD_NUMBER\" \"${TARGET_BUILD_DIR}\"/\"${INFOPLIST_PATH}\"\n";
876876
};
877877
/* End PBXShellScriptBuildPhase section */
878878

IINA+/Views/Base.lproj/Main.storyboard

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -319,24 +319,24 @@
319319
<scene sceneID="fyY-hb-PBe">
320320
<objects>
321321
<viewController id="UAs-CA-fHY" customClass="SidebarViewController" customModule="IINA_" customModuleProvider="target" sceneMemberID="viewController">
322-
<view key="view" misplaced="YES" id="wKp-mP-wYT">
322+
<view key="view" id="wKp-mP-wYT">
323323
<rect key="frame" x="0.0" y="0.0" width="72" height="419"/>
324324
<autoresizingMask key="autoresizingMask"/>
325325
<subviews>
326326
<visualEffectView blendingMode="behindWindow" material="sidebar" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="dDP-PF-C0a">
327-
<rect key="frame" x="0.0" y="0.0" width="72" height="402"/>
327+
<rect key="frame" x="0.0" y="0.0" width="72" height="419"/>
328328
<subviews>
329329
<progressIndicator wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="JWL-uO-Ceb">
330330
<rect key="frame" x="28" y="20" width="16" height="16"/>
331331
</progressIndicator>
332332
<scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="74" horizontalPageScroll="10" verticalLineScroll="74" verticalPageScroll="10" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" verticalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="99a-57-nij">
333-
<rect key="frame" x="0.0" y="61" width="72" height="301"/>
333+
<rect key="frame" x="0.0" y="61" width="72" height="318"/>
334334
<clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="mxK-09-4I5">
335-
<rect key="frame" x="0.0" y="0.0" width="72" height="301"/>
335+
<rect key="frame" x="0.0" y="0.0" width="72" height="318"/>
336336
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
337337
<subviews>
338338
<tableView verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="fullWidth" selectionHighlightStyle="none" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="49" viewBased="YES" id="fYM-Cq-LN4" customClass="SidebarTableView" customModule="IINA_" customModuleProvider="target">
339-
<rect key="frame" x="0.0" y="0.0" width="72" height="301"/>
339+
<rect key="frame" x="0.0" y="0.0" width="72" height="318"/>
340340
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
341341
<size key="intercellSpacing" width="1" height="25"/>
342342
<color key="backgroundColor" white="1" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -430,11 +430,11 @@
430430
<objects>
431431
<viewController id="XfG-lQ-9wD" customClass="MainViewController" customModule="IINA_" customModuleProvider="target" sceneMemberID="viewController">
432432
<customView key="view" id="r1P-qL-yvV" userLabel="View">
433-
<rect key="frame" x="0.0" y="0.0" width="380" height="651"/>
433+
<rect key="frame" x="0.0" y="0.0" width="377" height="633"/>
434434
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
435435
<subviews>
436436
<tabView drawsBackground="NO" type="noTabsNoBorder" translatesAutoresizingMaskIntoConstraints="NO" id="P2p-GB-s4i">
437-
<rect key="frame" x="0.0" y="0.0" width="380" height="651"/>
437+
<rect key="frame" x="0.0" y="0.0" width="377" height="633"/>
438438
<font key="font" metaFont="system"/>
439439
<tabViewItems>
440440
<tabViewItem label="bookmarks" identifier="bookmarks" id="fmm-kw-xbx" userLabel="Bookmarks">
@@ -912,7 +912,7 @@
912912
<rect key="frame" x="20" y="20" width="340" height="570"/>
913913
<clipView key="contentView" drawsBackground="NO" id="UI5-GE-yfn">
914914
<rect key="frame" x="0.0" y="0.0" width="340" height="570"/>
915-
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
915+
<autoresizingMask key="autoresizingMask"/>
916916
<subviews>
917917
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="plain" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="30" viewBased="YES" id="XaB-Al-kaU" customClass="SuggestionsTableView" customModule="IINA_" customModuleProvider="target">
918918
<rect key="frame" x="0.0" y="0.0" width="340" height="570"/>

0 commit comments

Comments
 (0)