paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-30 15:50:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Initial work for Android menu support (second part of commit forgotten in last one)

Browse Source 
git-svn-id: trunk@36393 -
This commit is contained in:
sekelsenmat 2012-03-28 12:23:26 +00:00
parent 348a233427
commit f3e22dc96a
2 changed files with 66 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lcl/interfaces/customdrawn/customdrawnint.pas
View File

@ -54,7 +54,7 @@ uses
lazcanvas, lazregions, lazdeviceapis,
InterfaceBase,
Controls, Forms, lclproc, IntfGraphics, GraphType,
LCLType, LMessages, Graphics, LCLStrConsts, LazLoggerBase;
LCLType, LMessages, Graphics, LCLStrConsts, Menus, LazLoggerBase;
type
{$ifdef CD_Windows}
@ -319,6 +319,8 @@ function Java_com_pascal_lclproject_LCLActivity_LCLOnConfigurationChanged(
env:PJNIEnv; this:jobject; ANewDPI, ANewWidth: jint): jint; cdecl;
function Java_com_pascal_lclproject_LCLActivity_LCLOnSensorChanged(
env:PJNIEnv; this:jobject; ASensorKind: jint; AValues: JDoubleArray): jint; cdecl;
function Java_com_pascal_lclproject_LCLActivity_LCLOnMenuAction(
env:PJNIEnv; this:jobject; kind: jint; itemIndex: jint): jint; cdecl;
function JNI_OnLoad(vm:PJavaVM;reserved:pointer):jint; cdecl;
procedure JNI_OnUnload(vm:PJavaVM;reserved:pointer); cdecl;

65
lcl/interfaces/customdrawn/customdrawnobject_android.inc
View File

@ -334,7 +334,65 @@ begin
Result := eventResult;
end;
const NativeMethods: array[0..7] of JNINativeMethod=
function Java_com_pascal_lclproject_LCLActivity_LCLOnMenuAction(
env:PJNIEnv; this:jobject; kind: jint; itemIndex: jint): jint; cdecl;
var
javaField_lclmenu_captions: jfieldid;
javaObject_lclmenu_captions: jobject;
lJavaString: jstring;
lCurrentForm: TCDNonNativeForm;
lMenu: TMainMenu;
Str: PChar;
lMenuItem: TMenuItem;
i, CurIndex: Integer;
begin
Result := 0;
//{$ifdef VerboseCDEvents}
__android_log_write(ANDROID_LOG_INFO,'lclapp',PChar(
Format('LCLOnMenuAction called kind=%d itemIndex=%d', [kind, itemIndex])));
//{$endif}
if (javaEnvRef = nil) then Exit;
// kind=0 means that we should create the menu items list
if kind = 0 then
begin
lCurrentForm := GetCurrentForm();
if lCurrentForm = nil then Exit;
lMenu := lCurrentForm.LCLForm.Menu;
if lMenu = nil then Exit;
javaField_lclmenu_captions := javaEnvRef^^.GetFieldID(javaEnvRef, javaActivityClass, 'lclmenu_captions', '[Ljava/lang/String;');
javaObject_lclmenu_captions := javaEnvRef^^.GetObjectField(javaEnvRef, javaActivityClass, javaField_lclmenu_captions);
CurIndex := 0;
for i := 0 to lMenu.Items.Count-1 do
begin
lMenuItem := lMenu.Items[i];
// Various things might make a menu item invalid and therefore not part of the list
if not lMenuItem.Visible then Continue;
if lMenuItem.Caption = '-' then Continue;
Str := PChar(lMenuItem.Caption);
lJavaString :=javaEnvRef^^.NewStringUTF(javaEnvRef, Str);
javaEnvRef^^.SetObjectArrayElement(javaEnvRef, javaObject_lclmenu_captions, CurIndex, lJavaString);
Inc(CurIndex);
if CurIndex >= 6 then Break;
end;
end
// kind=1 means a button click event
else
begin
end;
// This sends messages like Invalidate requests
Result := eventResult;
end;
const NativeMethods: array[0..8] of JNINativeMethod=
((name:'LCLDrawToBitmap';
signature:'(IILandroid/graphics/Bitmap;)I';
fnPtr:@Java_com_pascal_lclproject_LCLActivity_LCLDrawToBitmap;),
@ -358,7 +416,10 @@ const NativeMethods: array[0..7] of JNINativeMethod=
fnPtr:@Java_com_pascal_lclproject_LCLActivity_LCLOnConfigurationChanged;),
(name:'LCLOnSensorChanged';
signature:'(I[D)I';
fnPtr:@Java_com_pascal_lclproject_LCLActivity_LCLOnSensorChanged;)
fnPtr:@Java_com_pascal_lclproject_LCLActivity_LCLOnSensorChanged;),
(name:'LCLOnMenuAction';
signature:'(II)I';
fnPtr:@Java_com_pascal_lclproject_LCLActivity_LCLOnMenuAction;)
);
function JNI_OnLoad(vm:PJavaVM;reserved:pointer):jint; cdecl;