Merge pull request #149 from pebble/feature/update-ui-editor-for-sdk3

Update UI Editor for SDK3

Author: Katharine

ide/static/ide/js/editor.js

@@ -851,7 +851,7 @@ CloudPebble.Editor = (function() {
                         });
                         create_remote_file({
                             name: name + ".c",
-                            content: "#include \"" + name + ".h\"\n#include <pebble.h>\n\n" +
+                            content: "#include <pebble.h>\n#include \"" + name + ".h\"\n\n" +
                                 "// BEGIN AUTO-GENERATED UI CODE; DO NOT MODIFY\n" +
                                 "static void destroy_ui(void) {}\n" +
                                 "static void initialise_ui(void) {}\n" +

ide/static/ide/js/ib/canvas.js

@@ -29,7 +29,7 @@
         // Window properties
         var mProperties = {
             bg: new IB.Properties.Colour(pgettext("background colour", "Background"), IB.ColourWhite),
-            fullscreen: new IB.Properties.Bool(gettext("Fullscreen"), CloudPebble.ProjectInfo.app_is_watchface)
+            fullscreen: new IB.Properties.Bool(gettext("Fullscreen"), CloudPebble.ProjectInfo.app_is_watchface || CloudPebble.ProjectInfo.sdk_version == '3')
         };
         mProperties.bg.on('change', handleBackgroundChange, this);
         mProperties.fullscreen.on('change', handleFullscreenChange, this);
@@ -349,7 +349,9 @@
             if(mProperties.bg.getValue() != IB.ColourWhite) {
                 initialiser.push("window_set_background_color(s_window, " + mProperties.bg.getValue() + ");");
             }
-            initialiser.push("window_set_fullscreen(s_window, " + mProperties.fullscreen.getValue() + ");");
+            initialiser.push("#ifndef PBL_SDK_3");
+            initialiser.push("  window_set_fullscreen(s_window, " + mProperties.fullscreen.getValue() + ");");
+            initialiser.push("#endif");
             return initialiser;
         };