Merge pull request #52 from LabyMod/develop

0.4.4 - Add missing device scale method

Author: jan-br

VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

ultralight-java-base/src/main/java/com/labymedia/ultralight/UltralightView.java

@@ -321,6 +321,12 @@ public native void resize(@NativeType("uint32_t") @Unsigned long width, @NativeT
      */
     public native boolean needsPaint();
 
+    /**
+     * Sets the viewport scale factor.
+     * @param deviceScale the scale factor to set
+     */
+    public native void setDeviceScale(double deviceScale);
+
     /**
      * Get the inspector for this View, this is useful for debugging and inspecting pages locally. This will only
      * succeed if you have the inspector assets in your filesystem-- the inspector will look for

ultralight-java-native/src/main/c/include/ultralight_java/java_bridges/ultralight_view_jni.hpp

@@ -295,6 +295,8 @@ namespace ultralight_java {
          */
         static void set_needs_paint(JNIEnv *env, jobject instance, jboolean needs_paint);
 
+        static void set_device_scale(JNIEnv *env, jobject instance, jdouble device_scale);
+
         /**
          * Checks if this view needs a repaint
          *

ultralight-java-native/src/main/c/include/ultralight_java/ultralight_java_instance.hpp

@@ -207,7 +207,7 @@ namespace ultralight_java {
             /**
              * Native methods that should be bound
              */
-            std::array<JNINativeMethod, 31> native_methods;
+            std::array<JNINativeMethod, 32> native_methods;
         } ultralight_view;
 
         struct {

ultralight-java-native/src/main/c/src/java_bridges/ultralight_view_jni.cpp

@@ -371,6 +371,15 @@ namespace ultralight_java {
         view->set_needs_paint(needs_paint);
     }
 
+    void UltralightViewJNI::set_device_scale(JNIEnv *env, jobject instance, jdouble device_scale) {
+        auto view = UltralightRefPtrJNI::unwrap_ref_ptr<ultralight::View>(env, instance);
+        if(env->ExceptionCheck()) {
+            return;
+        }
+
+        view->set_device_scale(device_scale);
+    }
+
     jboolean UltralightViewJNI::needs_paint(JNIEnv *env, jobject instance) {
         auto view = UltralightRefPtrJNI::unwrap_ref_ptr<ultralight::View>(env, instance);
         if(env->ExceptionCheck()) {

ultralight-java-native/src/main/c/src/ultralight_initializer.cpp

@@ -155,6 +155,7 @@ namespace ultralight_java {
                  "(Lcom/labymedia/ultralight/plugin/loading/UltralightLoadListener;)V",
                  UltralightViewJNI::set_load_listener),
              NATIVE_METHOD("setNeedsPaint", "(Z)V", UltralightViewJNI::set_needs_paint),
+             NATIVE_METHOD("setDeviceScale", "(D)V", UltralightViewJNI::set_device_scale),
              NATIVE_METHOD("needsPaint", "()Z", UltralightViewJNI::needs_paint),
              NATIVE_METHOD("inspector", "()Lcom/labymedia/ultralight/UltralightView;", UltralightViewJNI::inspector),
              NATIVE_METHOD(