Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

[[ Bug 23102 ]] wip #7536

Open
montegoulding wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[[ Bug 23102 ]] wip #7536

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions engine/src/java/com/runrev/android/nativecontrol/NativeControlModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class NativeControlModule
{
public static final String TAG = "revandroid.NativeControlModule";
protected static Engine m_engine;
protected static RelativeLayout m_layout;
protected static AbsoluteLayout m_layout;
protected ViewGroup m_parent;
protected ArrayList<NativeControl> m_controls;

Expand All @@ -49,7 +49,7 @@ public void initContainer()
{
if (m_layout == null)
{
m_layout = new RelativeLayout(m_engine.getContext());
m_layout = new AbsoluteLayout(m_engine.getContext());

m_parent . addView(m_layout,
new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT,
Expand All @@ -63,7 +63,7 @@ public void addControl(Object p_control)
NativeControl t_control = (NativeControl)p_control;

//Log.i(TAG, String.format("native control layer: %d", ((ViewGroup)m_layout.getParent()).indexOfChild(m_layout)));
m_layout.addView(t_control.getView(), new RelativeLayout.LayoutParams(0, 0));
m_layout.addView(t_control.getView(), new AbsoluteLayout.LayoutParams(0, 0, 0, 0));

m_controls.add(t_control);
}
Expand Down Expand Up @@ -136,11 +136,7 @@ public Object createControl(String p_class_name)

public static ViewGroup.LayoutParams createLayoutParams(int left, int top, int right, int bottom)
{
RelativeLayout.LayoutParams t_layout = new RelativeLayout.LayoutParams(right - left, bottom - top);
t_layout.leftMargin = left;
t_layout.topMargin = top;
t_layout.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
t_layout.addRule(RelativeLayout.ALIGN_PARENT_TOP);
AbsoluteLayout.LayoutParams t_layout = new AbsoluteLayout.LayoutParams(right - left, bottom - top, left, top);
return t_layout;
}

Expand All @@ -167,7 +163,7 @@ public static Activity getActivity()
return (Activity)getContext();
}

public static RelativeLayout getNativeControlContainer()
public static AbsoluteLayout getNativeControlContainer()
{
return m_layout;
}
Expand Down