kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add flag for allow high DPI

Browse Source
This commit is contained in:
Joshua Granick
2016-03-01 11:53:54 -08:00
parent 78bf85b766
commit 4b2520a13f
8 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lime/_backend/native/NativeWindow.hx
View File

@@ -80,6 +80,7 @@ class NativeWindow {
} }
if (Reflect.hasField (parent.config, "allowHighDPI") && parent.config.allowHighDPI) flags |= cast WindowFlags.WINDOW_FLAG_ALLOW_HIGHDPI;
if (Reflect.hasField (parent.config, "borderless") && parent.config.borderless) flags |= cast WindowFlags.WINDOW_FLAG_BORDERLESS; if (Reflect.hasField (parent.config, "borderless") && parent.config.borderless) flags |= cast WindowFlags.WINDOW_FLAG_BORDERLESS;
if (Reflect.hasField (parent.config, "depthBuffer") && parent.config.depthBuffer) flags |= cast WindowFlags.WINDOW_FLAG_DEPTH_BUFFER; if (Reflect.hasField (parent.config, "depthBuffer") && parent.config.depthBuffer) flags |= cast WindowFlags.WINDOW_FLAG_DEPTH_BUFFER;
if (Reflect.hasField (parent.config, "fullscreen") && parent.config.fullscreen) flags |= cast WindowFlags.WINDOW_FLAG_FULLSCREEN; if (Reflect.hasField (parent.config, "fullscreen") && parent.config.fullscreen) flags |= cast WindowFlags.WINDOW_FLAG_FULLSCREEN;
@@ -354,5 +355,6 @@ class NativeWindow {
var WINDOW_FLAG_REQUIRE_SHADERS = 0x00000100; var WINDOW_FLAG_REQUIRE_SHADERS = 0x00000100;
var WINDOW_FLAG_DEPTH_BUFFER = 0x00000200; var WINDOW_FLAG_DEPTH_BUFFER = 0x00000200;
var WINDOW_FLAG_STENCIL_BUFFER = 0x00000400; var WINDOW_FLAG_STENCIL_BUFFER = 0x00000400;
var WINDOW_FLAG_ALLOW_HIGHDPI = 0x00000800;
} }

1
lime/app/Config.hx
View File

@@ -21,6 +21,7 @@ typedef Config = {
typedef WindowConfig = { typedef WindowConfig = {
@:optional var allowHighDPI:Bool;
@:optional var antialiasing:Int; @:optional var antialiasing:Int;
@:optional var background:Int; @:optional var background:Int;
@:optional var borderless:Bool; @:optional var borderless:Bool;

2
lime/project/HXProject.hx
View File

@@ -118,7 +118,7 @@ class HXProject {
defaultMeta = { title: "MyApplication", description: "", packageName: "com.example.myapp", version: "1.0.0", company: "Example, Inc.", companyUrl: "", buildNumber: "1", companyId: "" } defaultMeta = { title: "MyApplication", description: "", packageName: "com.example.myapp", version: "1.0.0", company: "Example, Inc.", companyUrl: "", buildNumber: "1", companyId: "" }
defaultApp = { main: "Main", file: "MyApplication", path: "bin", preloader: "", swfVersion: 11.2, url: "", init: null } defaultApp = { main: "Main", file: "MyApplication", path: "bin", preloader: "", swfVersion: 11.2, url: "", init: null }
defaultWindow = { width: 800, height: 600, parameters: "{}", background: 0xFFFFFF, fps: 30, hardware: true, display: 0, resizable: true, borderless: false, orientation: Orientation.AUTO, vsync: false, fullscreen: false, antialiasing: 0, allowShaders: true, requireShaders: false, depthBuffer: false, stencilBuffer: false } defaultWindow = { width: 800, height: 600, parameters: "{}", background: 0xFFFFFF, fps: 30, hardware: true, display: 0, resizable: true, borderless: false, orientation: Orientation.AUTO, vsync: false, fullscreen: false, allowHighDPI: true, antialiasing: 0, allowShaders: true, requireShaders: false, depthBuffer: false, stencilBuffer: false }
platformType = PlatformType.DESKTOP; platformType = PlatformType.DESKTOP;
architectures = []; architectures = [];

8
lime/project/ProjectXMLParser.hx
View File

@@ -1756,6 +1756,14 @@ class ProjectXMLParser extends HXProject {
} }
case "allow-high-dpi":
if (Reflect.hasField (windows[id], "allowHighDPI")) {
Reflect.setField (windows[id], "allowHighDPI", value == "true");
}
default: default:
if (Reflect.hasField (windows[id], name)) { if (Reflect.hasField (windows[id], name)) {

1
lime/project/WindowData.hx
View File

@@ -16,6 +16,7 @@ typedef WindowData = {
@:optional var borderless:Bool; @:optional var borderless:Bool;
@:optional var vsync:Bool; @:optional var vsync:Bool;
@:optional var fullscreen:Bool; @:optional var fullscreen:Bool;
@:optional var allowHighDPI:Bool;
@:optional var antialiasing:Int; @:optional var antialiasing:Int;
@:optional var orientation:Orientation; @:optional var orientation:Orientation;
@:optional var allowShaders:Bool; @:optional var allowShaders:Bool;

7
lime/tools/helpers/HTML5Helper.hx
View File

@@ -174,6 +174,13 @@ class HTML5Helper {
var templatePaths = [ PathHelper.combine (PathHelper.getHaxelib (new Haxelib ("lime")), "templates") ].concat (project.templatePaths); var templatePaths = [ PathHelper.combine (PathHelper.getHaxelib (new Haxelib ("lime")), "templates") ].concat (project.templatePaths);
var args = [ "-Dapple.awt.UIElement=true", "-jar", PathHelper.findTemplate (templatePaths, "bin/compiler.jar"), "--js", sourceFile, "--js_output_file", tempFile ]; var args = [ "-Dapple.awt.UIElement=true", "-jar", PathHelper.findTemplate (templatePaths, "bin/compiler.jar"), "--js", sourceFile, "--js_output_file", tempFile ];
if (project.targetFlags.exists ("advanced")) {
args.push ("--compilation_level");
args.push ("ADVANCED_OPTIMIZATIONS");
}
if (!LogHelper.verbose) { if (!LogHelper.verbose) {
args.push ("--jscomp_off=uselessCode"); args.push ("--jscomp_off=uselessCode");

3
project/include/ui/Window.h
View File

@@ -62,7 +62,8 @@ namespace lime {
WINDOW_FLAG_ALLOW_SHADERS = 0x00000080, WINDOW_FLAG_ALLOW_SHADERS = 0x00000080,
WINDOW_FLAG_REQUIRE_SHADERS = 0x00000100, WINDOW_FLAG_REQUIRE_SHADERS = 0x00000100,
WINDOW_FLAG_DEPTH_BUFFER = 0x00000200, WINDOW_FLAG_DEPTH_BUFFER = 0x00000200,
WINDOW_FLAG_STENCIL_BUFFER = 0x00000400 WINDOW_FLAG_STENCIL_BUFFER = 0x00000400,
WINDOW_FLAG_ALLOW_HIGHDPI = 0x00000800
}; };

7
project/src/backend/sdl/SDLWindow.cpp
View File

@@ -39,7 +39,12 @@ namespace lime {
if (flags & WINDOW_FLAG_HARDWARE) { if (flags & WINDOW_FLAG_HARDWARE) {
sdlFlags |= SDL_WINDOW_OPENGL; sdlFlags |= SDL_WINDOW_OPENGL;
sdlFlags |= SDL_WINDOW_ALLOW_HIGHDPI;
if (flags & WINDOW_FLAG_ALLOW_HIGHDPI) {
sdlFlags |= SDL_WINDOW_ALLOW_HIGHDPI;
}
#if defined (HX_WINDOWS) && defined (NATIVE_TOOLKIT_SDL_ANGLE) #if defined (HX_WINDOWS) && defined (NATIVE_TOOLKIT_SDL_ANGLE)
SDL_GL_SetAttribute (SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES); SDL_GL_SetAttribute (SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);