dmuratshin 9 years ago
parent
commit
5c0633af85

+ 6 - 0
oxygine/src/VisualStyle.cpp

@@ -77,4 +77,10 @@ namespace oxygine
     {
     {
         _vstyle.setColor(color);
         _vstyle.setColor(color);
     }
     }
+
+	void VStyleActor::setColor(unsigned char r, unsigned char g, unsigned char b, unsigned char a)
+	{
+		setColor(Color(r, g, b, a));
+	}
+
 }
 }

+ 1 - 0
oxygine/src/VisualStyle.h

@@ -40,6 +40,7 @@ namespace oxygine
         const Color&            getColor() const;
         const Color&            getColor() const;
 
 
         void                    setColor(const Color& color);
         void                    setColor(const Color& color);
+		void                    setColor(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
         void                    setBlendMode(blend_mode mode) {_vstyle.setBlendMode(mode);}
         void                    setBlendMode(blend_mode mode) {_vstyle.setBlendMode(mode);}
 
 
         typedef Property<Color, const Color&, VStyleActor, &VStyleActor::getColor, &VStyleActor::setColor> TweenColor;
         typedef Property<Color, const Color&, VStyleActor, &VStyleActor::getColor, &VStyleActor::setColor> TweenColor;

+ 4 - 4
oxygine/src/core/android/jniUtils.cpp

@@ -54,7 +54,7 @@ namespace oxygine
             JNI_NOT_NULL(_jUtils_getPackage);
             JNI_NOT_NULL(_jUtils_getPackage);
 
 
             _jUtils_getProperty = env->GetStaticMethodID(_jUtils, "getProperty", "(Ljava/lang/String;)Ljava/lang/String;");
             _jUtils_getProperty = env->GetStaticMethodID(_jUtils, "getProperty", "(Ljava/lang/String;)Ljava/lang/String;");
-            JNI_NOT_NULL(_jUtils_getProperty);            
+            JNI_NOT_NULL(_jUtils_getProperty);
 
 
             _jUtils_isNetworkAvailable = env->GetStaticMethodID(_jUtils, "isNetworkAvailable", "()Z");
             _jUtils_isNetworkAvailable = env->GetStaticMethodID(_jUtils, "isNetworkAvailable", "()Z");
             JNI_NOT_NULL(_jUtils_isNetworkAvailable);
             JNI_NOT_NULL(_jUtils_isNetworkAvailable);
@@ -211,14 +211,14 @@ namespace oxygine
         return r;
         return r;
     }
     }
 
 
-    std::string     jniGetProperty(const std::string &id)
-    { 
+    std::string     jniGetProperty(const std::string& id)
+    {
         JNIEnv* env = jniGetEnv();
         JNIEnv* env = jniGetEnv();
         LOCAL_REF_HOLDER(env);
         LOCAL_REF_HOLDER(env);
 
 
         jstring jarg = env->NewStringUTF(id.c_str());
         jstring jarg = env->NewStringUTF(id.c_str());
         jstring jstr = (jstring)env->CallStaticObjectMethod(_jUtils, _jUtils_getProperty, jarg);
         jstring jstr = (jstring)env->CallStaticObjectMethod(_jUtils, _jUtils_getProperty, jarg);
-        
+
 
 
         return jniGetString(env, jstr);
         return jniGetString(env, jstr);
     }
     }

+ 1 - 1
oxygine/src/core/android/jniUtils.h

@@ -27,5 +27,5 @@ namespace oxygine
     jobject         jniFindExtension(JNIEnv* env, jclass cl);
     jobject         jniFindExtension(JNIEnv* env, jclass cl);
 
 
 
 
-    std::string     jniGetProperty(const std::string &id);
+    std::string     jniGetProperty(const std::string& id);
 }
 }