- fix mac issues

Author: polymonster

.gitignore

@@ -39,5 +39,5 @@ Temporary Items
 .apdisk
 build_config_user.json
 test_results/
-**/container.txt
-**.user.jsn
+**.user.jsn
+**.container.txt

core/pen/source/osx/os.mm

@@ -35,6 +35,7 @@
         pen::pen_creation_params creation_params;
         NSWindow*                window;
         bool                     terminate_app = false;
+        s32                      window_scale = 1;
     };
     os_context s_ctx;
 
@@ -607,6 +608,9 @@ void pen_run_windowed(int argc, char** argv)
             [s_ctx.window setAcceptsMouseMovedEvents:YES];
             [s_ctx.window center];
             [s_ctx.window registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, nil]];
+            
+            s_ctx.window_scale = [s_ctx.window backingScaleFactor];
+            
             _update_window_frame();
 
             // creates an opengl or metal rendering context
@@ -741,8 +745,8 @@ bool input_redo_pressed()
 
     void window_get_size(s32& width, s32& height)
     {
-        width = pen_window.width;
-        height = pen_window.height;
+        width = pen_window.width * s_ctx.window_scale;
+        height = pen_window.height * s_ctx.window_scale;
     }
 
     f32 window_get_aspect()

core/template/osx/Info.plist

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key></key>
+	<string></string>
+	<key>ATSApplicationFontsPath</key>
+	<string>data/fonts</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+	<key>NSHighResolutionCapable</key>
+	<false/>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSSupportsAutomaticTermination</key>
+	<true/>
+	<key>NSSupportsSuddenTermination</key>
+	<false/>
+</dict>
+</plist>

tools/premake/app_template.lua

@@ -24,6 +24,11 @@ local function setup_osx()
 	}
 	add_pmtech_links()
 
+	files
+	{
+		(pmtech_dir .. "core/template/osx/Info.plist")
+	}
+	
 	if _ACTION == "xcode4" then
 	install_name_tool = "cd ../../bin/osx && install_name_tool -add_rpath @executable_path/../../.. "
 	configuration "Debug"