diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java index a77892a1a..5031144e9 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java @@ -53,6 +53,7 @@ import net.kdt.pojavlaunch.customcontrols.EditorExitable; import net.kdt.pojavlaunch.customcontrols.keyboard.LwjglCharSender; import net.kdt.pojavlaunch.customcontrols.keyboard.TouchCharInput; import net.kdt.pojavlaunch.customcontrols.mouse.GyroControl; +import net.kdt.pojavlaunch.customcontrols.mouse.HotbarView; import net.kdt.pojavlaunch.customcontrols.mouse.Touchpad; import net.kdt.pojavlaunch.lifecycle.ContextExecutor; import net.kdt.pojavlaunch.prefs.LauncherPreferences; @@ -84,6 +85,7 @@ public class MainActivity extends BaseActivity implements ControlButtonMenuListe private View mDrawerPullButton; private GyroControl mGyroControl = null; private ControlLayout mControlLayout; + private HotbarView mHotbarView; MinecraftProfile minecraftProfile; @@ -259,6 +261,7 @@ public class MainActivity extends BaseActivity implements ControlButtonMenuListe mControlLayout = findViewById(R.id.main_control_layout); touchCharInput = findViewById(R.id.mainTouchCharInput); mDrawerPullButton = findViewById(R.id.drawer_button); + mHotbarView = findViewById(R.id.hotbar_view); } @Override @@ -389,6 +392,7 @@ public class MainActivity extends BaseActivity implements ControlButtonMenuListe @Override public void onResolutionChanged() { minecraftGLView.refreshSize(); + mHotbarView.onResolutionChanged(); } @Override diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/mouse/HotbarView.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/mouse/HotbarView.java index 39b769045..522b0fe5b 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/mouse/HotbarView.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/mouse/HotbarView.java @@ -124,6 +124,13 @@ public class HotbarView extends View implements MCOptionUtils.MCOptionListener, return (int)((mGuiScale * input) / LauncherPreferences.PREF_SCALE_FACTOR); } + /** Forces the view to reposition itself. */ + public void onResolutionChanged() { + if(getParent() == null) return; + mGuiScale = MCOptionUtils.getMcScale(); + post(this::repositionView); + } + @Override public void onOptionChanged() { post(this); diff --git a/app_pojavlauncher/src/main/res/layout/activity_basemain.xml b/app_pojavlauncher/src/main/res/layout/activity_basemain.xml index 99080c94a..a7a95d639 100644 --- a/app_pojavlauncher/src/main/res/layout/activity_basemain.xml +++ b/app_pojavlauncher/src/main/res/layout/activity_basemain.xml @@ -56,6 +56,7 @@ android:elevation="10dp" android:layout_gravity="center_horizontal"/>