mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-16 00:34:19 +00:00
Code Activity

Minor fixes for mac compilation. Android stuff.

Browse source
This commit is contained in:
Julian Storer 2011-02-05 15:15:45 +00:00
parent 571a2626da
commit 08339c92e2
23 changed files with 1233 additions and 616 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/native/android/juce_android_Windowing.cpp
View file

@ -27,6 +27,7 @@
// compiled on its own).
#if JUCE_INCLUDED_FILE
static ModifierKeys currentModifiers;
//==============================================================================
class AndroidComponentPeer : public ComponentPeer
@ -34,9 +35,9 @@ class AndroidComponentPeer : public ComponentPeer
public:
//==============================================================================
AndroidComponentPeer (Component* const component, const int windowStyleFlags)
: ComponentPeer (component, windowStyleFlags)
: ComponentPeer (component, windowStyleFlags),
view (android.activity.callObjectMethod (android.createNewView))
{
view = GlobalRef (android.env, android.activity.callObjectMethod (android.createNewView));
}
~AndroidComponentPeer()
@ -57,7 +58,7 @@ public:
void setTitle (const String& title)
{
view.callVoidMethod (android.setViewName, android.javaString (title));
view.callVoidMethod (android.setViewName, javaString (title).get());
}
void setPosition (int x, int y)
@ -87,7 +88,7 @@ public:
const Point<int> getScreenPosition() const
{
JNIEnv* const env = view.getEnv();
JNIEnv* const env = getEnv();
jintArray pos = env->NewIntArray (2);
view.callVoidMethod (android.getLocationOnScreen, pos);
@ -169,6 +170,26 @@ public:
// TODO
}
//==============================================================================
void handleMouseDownCallback (float x, float y, int64 time)
{
currentModifiers = currentModifiers.withoutMouseButtons();
handleMouseEvent (0, Point<int> ((int) x, (int) y), currentModifiers, time);
currentModifiers = currentModifiers.withoutMouseButtons().withFlags (ModifierKeys::leftButtonModifier);
handleMouseEvent (0, Point<int> ((int) x, (int) y), currentModifiers, time);
}
void handleMouseDragCallback (float x, float y, int64 time)
{
handleMouseEvent (0, Point<int> ((int) x, (int) y), currentModifiers, time);
}
void handleMouseUpCallback (float x, float y, int64 time)
{
currentModifiers = currentModifiers.withoutMouseButtons();
handleMouseEvent (0, Point<int> ((int) x, (int) y), currentModifiers, time);
}
//==============================================================================
bool isFocused() const
{
@ -188,7 +209,8 @@ public:
//==============================================================================
void handlePaintCallback (JNIEnv* env, jobject canvas)
{
AndroidLowLevelGraphicsContext g (GlobalRef (env, canvas));
GlobalRef canvasRef (canvas);
AndroidLowLevelGraphicsContext g (canvasRef);
handlePaint (g);
}
@ -241,6 +263,12 @@ private:
JUCE_VIEW_CALLBACK (void, handlePaint, (JNIEnv* env, jobject view, jobject canvas),
handlePaintCallback (env, canvas))
JUCE_VIEW_CALLBACK (void, handleMouseDown, (JNIEnv*, jobject view, jfloat x, jfloat y, jlong time),
handleMouseDownCallback ((float) x, (float) y, (int64) time))
JUCE_VIEW_CALLBACK (void, handleMouseDrag, (JNIEnv*, jobject view, jfloat x, jfloat y, jlong time),
handleMouseDragCallback ((float) x, (float) y, (int64) time))
JUCE_VIEW_CALLBACK (void, handleMouseUp, (JNIEnv*, jobject view, jfloat x, jfloat y, jlong time),
handleMouseUpCallback ((float) x, (float) y, (int64) time))
//==============================================================================
ComponentPeer* Component::createNewPeer (int styleFlags, void*)
@ -294,8 +322,7 @@ void ModifierKeys::updateCurrentModifiers() throw()
const ModifierKeys ModifierKeys::getCurrentModifiersRealtime() throw()
{
// TODO
return ModifierKeys();
return currentModifiers;
}
//==============================================================================