From 27baa01820b2f1f07c4ae72197e3879cee816dc9 Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Wed, 26 Dec 2018 17:05:25 -0800
Subject: Added OpenGL and Vulkan logo to mode selection view on Mac

---
 .../Apple/Data/OSX/Base.lproj/Main.storyboard      |  46 ++++++++++-----------
 .../Apple/Data/OSX/Images.xcassets/opengl-logo.png | Bin 0 -> 42517 bytes
 .../Apple/Data/OSX/Images.xcassets/vulkan-logo.png | Bin 0 -> 35692 bytes
 Common/NativeApp/CMakeLists.txt                    |   2 +
 4 files changed, 23 insertions(+), 25 deletions(-)
 create mode 100644 Common/NativeApp/Apple/Data/OSX/Images.xcassets/opengl-logo.png
 create mode 100644 Common/NativeApp/Apple/Data/OSX/Images.xcassets/vulkan-logo.png

(limited to 'Common/NativeApp')

diff --git a/Common/NativeApp/Apple/Data/OSX/Base.lproj/Main.storyboard b/Common/NativeApp/Apple/Data/OSX/Base.lproj/Main.storyboard
index d01e912..3f74277 100644
--- a/Common/NativeApp/Apple/Data/OSX/Base.lproj/Main.storyboard
+++ b/Common/NativeApp/Apple/Data/OSX/Base.lproj/Main.storyboard
@@ -3,7 +3,6 @@
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-        <capability name="system font weights other than Regular or Bold" minToolsVersion="7.0"/>
     </dependencies>
     <scenes>
         <!--Application-->
@@ -174,45 +173,42 @@
         <scene sceneID="rTr-Qo-t8b">
             <objects>
                 <viewController id="lYj-9Z-eqp" customClass="ModeSelectionViewController" sceneMemberID="viewController">
-                    <view key="view" id="SPq-vc-rSb">
-                        <rect key="frame" x="0.0" y="0.0" width="350" height="253"/>
+                    <view key="view" autoresizesSubviews="NO" id="SPq-vc-rSb">
+                        <rect key="frame" x="0.0" y="0.0" width="350" height="255"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
-                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FNk-f7-1ho">
-                                <rect key="frame" x="129" y="60" width="92" height="43"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="32" id="xCk-Gq-MrX"/>
-                                </constraints>
-                                <buttonCell key="cell" type="push" title="Vulkan" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Nsa-CK-D42">
+                            <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zEs-tf-G2z" userLabel="OpenGL">
+                                <rect key="frame" x="59" y="143" width="233" height="82"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="opengl-logo" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="I5f-XW-9L1">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="systemSemibold" size="16"/>
+                                    <font key="font" metaFont="system"/>
+                                    <connections>
+                                        <action selector="goOpenGL:" target="lYj-9Z-eqp" id="Sg7-XX-Ktg"/>
+                                    </connections>
                                 </buttonCell>
-                                <connections>
-                                    <action selector="goVulkan:" target="lYj-9Z-eqp" id="bnQ-Bu-l9T"/>
-                                </connections>
                             </button>
-                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zva-9q-Xj2">
-                                <rect key="frame" x="124" y="143" width="102" height="32"/>
-                                <buttonCell key="cell" type="push" title="OpenGL" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="xhq-D1-XDx">
+                            <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mhf-V7-TKz" userLabel="Vulkan">
+                                <rect key="frame" x="59" y="32" width="233" height="82"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="vulkan-logo" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="PWi-41-bCy">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="systemSemibold" size="16"/>
+                                    <font key="font" metaFont="system"/>
                                 </buttonCell>
                                 <connections>
-                                    <action selector="goOpenGL:" target="lYj-9Z-eqp" id="eDU-k4-Qyl"/>
+                                    <action selector="goVulkan:" target="lYj-9Z-eqp" id="Vj9-0Y-bjn"/>
                                 </connections>
                             </button>
                         </subviews>
-                        <constraints>
-                            <constraint firstItem="zva-9q-Xj2" firstAttribute="centerX" secondItem="SPq-vc-rSb" secondAttribute="centerX" id="6Je-LA-wKz"/>
-                            <constraint firstItem="zva-9q-Xj2" firstAttribute="top" secondItem="SPq-vc-rSb" secondAttribute="top" constant="82" id="RKY-jP-kug"/>
-                            <constraint firstItem="zva-9q-Xj2" firstAttribute="centerX" secondItem="FNk-f7-1ho" secondAttribute="centerX" id="bGn-rh-tGz"/>
-                            <constraint firstItem="FNk-f7-1ho" firstAttribute="top" secondItem="zva-9q-Xj2" secondAttribute="bottom" constant="51" id="sTn-Gq-zp6"/>
-                        </constraints>
                     </view>
                 </viewController>
                 <customObject id="IGK-9x-tXY" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="220" y="828.5"/>
+            <point key="canvasLocation" x="171" y="1214"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="opengl-logo" width="900" height="375"/>
+        <image name="vulkan-logo" width="975" height="375"/>
+    </resources>
 </document>
diff --git a/Common/NativeApp/Apple/Data/OSX/Images.xcassets/opengl-logo.png b/Common/NativeApp/Apple/Data/OSX/Images.xcassets/opengl-logo.png
new file mode 100644
index 0000000..5d4a211
Binary files /dev/null and b/Common/NativeApp/Apple/Data/OSX/Images.xcassets/opengl-logo.png differ
diff --git a/Common/NativeApp/Apple/Data/OSX/Images.xcassets/vulkan-logo.png b/Common/NativeApp/Apple/Data/OSX/Images.xcassets/vulkan-logo.png
new file mode 100644
index 0000000..8a15b9e
Binary files /dev/null and b/Common/NativeApp/Apple/Data/OSX/Images.xcassets/vulkan-logo.png differ
diff --git a/Common/NativeApp/CMakeLists.txt b/Common/NativeApp/CMakeLists.txt
index a1101ed..4abbcfe 100644
--- a/Common/NativeApp/CMakeLists.txt
+++ b/Common/NativeApp/CMakeLists.txt
@@ -167,6 +167,8 @@ elseif(PLATFORM_MACOS)
         set(APPLE_RESOURCES
             ${NATIVE_APP_SOURCE_DIR}/Apple/Data/OSX/Base.lproj/Main.storyboard
             ${NATIVE_APP_SOURCE_DIR}/Apple/Data/OSX/Images.xcassets/AppIcon.appiconset/dg.icns
+            ${NATIVE_APP_SOURCE_DIR}/Apple/Data/OSX/Images.xcassets/opengl-logo.png
+            ${NATIVE_APP_SOURCE_DIR}/Apple/Data/OSX/Images.xcassets/vulkan-logo.png
         )
 
         set(APPLE_INFO_PLIST
-- 
cgit v1.2.3