mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-10-07 15:53:34 +00:00
[Android] Fix alignment issues with the overlay config settings.
This commit is contained in:
parent
7c6caa388a
commit
d9be95ed9e
@ -1,16 +1,23 @@
|
|||||||
<RelativeLayout
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:id="@+id/inputLayout"
|
android:id="@+id/inputLayout"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent" >
|
android:layout_height="fill_parent"
|
||||||
|
android:clipChildren="false"
|
||||||
|
android:clipToPadding="false" >
|
||||||
|
|
||||||
<org.dolphinemu.dolphinemu.settings.input.InputOverlayConfigButton
|
<org.dolphinemu.dolphinemu.settings.input.InputOverlayConfigButton
|
||||||
android:id="@+id/button_a"
|
android:id="@+id/button_a"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentBottom="false"
|
||||||
|
android:layout_alignParentEnd="false"
|
||||||
android:layout_alignParentLeft="false"
|
android:layout_alignParentLeft="false"
|
||||||
|
android:layout_alignParentRight="false"
|
||||||
|
android:layout_alignParentStart="false"
|
||||||
android:layout_alignParentTop="false"
|
android:layout_alignParentTop="false"
|
||||||
|
android:layout_alignWithParentIfMissing="false"
|
||||||
android:layout_centerHorizontal="false"
|
android:layout_centerHorizontal="false"
|
||||||
|
android:layout_centerInParent="false"
|
||||||
android:layout_centerVertical="false"
|
android:layout_centerVertical="false"
|
||||||
android:background="@drawable/button_a" />
|
android:background="@drawable/button_a" />
|
||||||
|
|
||||||
@ -18,22 +25,32 @@
|
|||||||
android:id="@+id/button_b"
|
android:id="@+id/button_b"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentBottom="false"
|
||||||
|
android:layout_alignParentEnd="false"
|
||||||
android:layout_alignParentLeft="false"
|
android:layout_alignParentLeft="false"
|
||||||
|
android:layout_alignParentRight="false"
|
||||||
|
android:layout_alignParentStart="false"
|
||||||
android:layout_alignParentTop="false"
|
android:layout_alignParentTop="false"
|
||||||
|
android:layout_alignWithParentIfMissing="false"
|
||||||
android:layout_centerHorizontal="false"
|
android:layout_centerHorizontal="false"
|
||||||
|
android:layout_centerInParent="false"
|
||||||
android:layout_centerVertical="false"
|
android:layout_centerVertical="false"
|
||||||
android:layout_toRightOf="@+id/button_a"
|
|
||||||
android:background="@drawable/button_b" />
|
android:background="@drawable/button_b" />
|
||||||
|
|
||||||
<org.dolphinemu.dolphinemu.settings.input.InputOverlayConfigButton
|
<org.dolphinemu.dolphinemu.settings.input.InputOverlayConfigButton
|
||||||
android:id="@+id/button_start"
|
android:id="@+id/button_start"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentBottom="false"
|
||||||
|
android:layout_alignParentEnd="false"
|
||||||
android:layout_alignParentLeft="false"
|
android:layout_alignParentLeft="false"
|
||||||
|
android:layout_alignParentRight="false"
|
||||||
|
android:layout_alignParentStart="false"
|
||||||
android:layout_alignParentTop="false"
|
android:layout_alignParentTop="false"
|
||||||
|
android:layout_alignWithParentIfMissing="false"
|
||||||
android:layout_centerHorizontal="false"
|
android:layout_centerHorizontal="false"
|
||||||
|
android:layout_centerInParent="false"
|
||||||
android:layout_centerVertical="false"
|
android:layout_centerVertical="false"
|
||||||
android:layout_toRightOf="@+id/button_b"
|
|
||||||
android:background="@drawable/button_start" />
|
android:background="@drawable/button_start" />
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
@ -39,7 +39,7 @@ public final class InputOverlayConfigButton extends Button implements OnTouchLis
|
|||||||
|
|
||||||
// Get the SharedPreferences instance.
|
// Get the SharedPreferences instance.
|
||||||
sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
|
sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
|
||||||
|
|
||||||
// String ID of this button.
|
// String ID of this button.
|
||||||
final String buttonId = getResources().getResourceEntryName(getId());
|
final String buttonId = getResources().getResourceEntryName(getId());
|
||||||
|
|
||||||
@ -49,8 +49,6 @@ public final class InputOverlayConfigButton extends Button implements OnTouchLis
|
|||||||
|
|
||||||
// If they are not -1, then they have a previous value set.
|
// If they are not -1, then they have a previous value set.
|
||||||
// Thus, we set those coordinate values.
|
// Thus, we set those coordinate values.
|
||||||
// TODO: This is not always correct placement. Fix this.
|
|
||||||
// Likely something to do with the backing layout being a relative layout.
|
|
||||||
if (x != -1f && y != -1f)
|
if (x != -1f && y != -1f)
|
||||||
{
|
{
|
||||||
setX(x);
|
setX(x);
|
||||||
|
Loading…
Reference in New Issue
Block a user