sneedmca/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS synced 2024-10-30 03:37:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

android: Updated custom layout coordinate system to match desktop

Browse source
This commit is contained in:
David Griswold 2024-08-11 13:43:27 +01:00 committed by OpenSauce
parent 138e4bcbd0
commit c5ac6e84da
6 changed files with 84 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/android/app/src/main/jni/config.cpp
View file

@ -188,17 +188,15 @@ void Config::ReadValues() {
ReadSetting("Layout", Settings::values.cardboard_x_shift); ReadSetting("Layout", Settings::values.cardboard_x_shift);
ReadSetting("Layout", Settings::values.cardboard_y_shift); ReadSetting("Layout", Settings::values.cardboard_y_shift);
#ifdef ANDROID
ReadSetting("Layout", Settings::values.custom_portrait_layout); ReadSetting("Layout", Settings::values.custom_portrait_layout);
ReadSetting("Layout", Settings::values.custom_portrait_top_left); ReadSetting("Layout", Settings::values.custom_portrait_top_x);
ReadSetting("Layout", Settings::values.custom_portrait_top_top); ReadSetting("Layout", Settings::values.custom_portrait_top_y);
ReadSetting("Layout", Settings::values.custom_portrait_top_right); ReadSetting("Layout", Settings::values.custom_portrait_top_width);
ReadSetting("Layout", Settings::values.custom_portrait_top_bottom); ReadSetting("Layout", Settings::values.custom_portrait_top_height);
ReadSetting("Layout", Settings::values.custom_portrait_bottom_left); ReadSetting("Layout", Settings::values.custom_portrait_bottom_x);
ReadSetting("Layout", Settings::values.custom_portrait_bottom_top); ReadSetting("Layout", Settings::values.custom_portrait_bottom_y);
ReadSetting("Layout", Settings::values.custom_portrait_bottom_right); ReadSetting("Layout", Settings::values.custom_portrait_bottom_width);
ReadSetting("Layout", Settings::values.custom_portrait_bottom_bottom); ReadSetting("Layout", Settings::values.custom_portrait_bottom_height);
#endif
// Utility // Utility
ReadSetting("Utility", Settings::values.dump_textures); ReadSetting("Utility", Settings::values.dump_textures);

16
src/android/app/src/main/jni/default_ini.h
View file

@ -206,14 +206,14 @@ custom_portrait_layout =
# Screen placement when using Custom layout option # Screen placement when using Custom layout option
# 0x, 0y is the top left corner of the render window. # 0x, 0y is the top left corner of the render window.
custom_portrait_top_left = custom_portrait_top_x =
custom_portrait_top_top = custom_portrait_top_y =
custom_portrait_top_right = custom_portrait_top_width =
custom_portrait_top_bottom = custom_portrait_top_height =
custom_portrait_bottom_left = custom_portrait_bottom_x =
custom_portrait_bottom_top = custom_portrait_bottom_y =
custom_portrait_bottom_right = custom_portrait_bottom_width =
custom_portrait_bottom_bottom = custom_portrait_bottom_height =
# Swaps the prominent screen with the other screen. # Swaps the prominent screen with the other screen.
# For example, if Single Screen is chosen, setting this to 1 will display the bottom screen instead of the top screen. # For example, if Single Screen is chosen, setting this to 1 will display the bottom screen instead of the top screen.

16
src/common/settings.h
View file

@ -507,14 +507,14 @@ struct Values {
Setting<u16> screen_bottom_topbottom_padding{0, "screen_bottom_topbottom_padding"}; Setting<u16> screen_bottom_topbottom_padding{0, "screen_bottom_topbottom_padding"};
Setting<bool> custom_portrait_layout{false, "custom_portrait_layout"}; Setting<bool> custom_portrait_layout{false, "custom_portrait_layout"};
Setting<u16> custom_portrait_top_left{0, "custom_portrait_top_left"}; Setting<u16> custom_portrait_top_x{0, "custom_portrait_top_x"};
Setting<u16> custom_portrait_top_top{0, "custom_portrait_top_top"}; Setting<u16> custom_portrait_top_y{0, "custom_portrait_top_y"};
Setting<u16> custom_portrait_top_right{400, "custom_portrait_top_right"}; Setting<u16> custom_portrait_top_width{400, "custom_portrait_top_width"};
Setting<u16> custom_portrait_top_bottom{240, "custom_portrait_top_bottom"}; Setting<u16> custom_portrait_top_height{240, "custom_portrait_top_height"};
Setting<u16> custom_portrait_bottom_left{40, "custom_portrait_bottom_left"}; Setting<u16> custom_portrait_bottom_x{40, "custom_portrait_bottom_x"};
Setting<u16> custom_portrait_bottom_top{240, "custom_portrait_bottom_top"}; Setting<u16> custom_portrait_bottom_y{240, "custom_portrait_bottom_y"};
Setting<u16> custom_portrait_bottom_right{360, "custom_portrait_bottom_right"}; Setting<u16> custom_portrait_bottom_width{360, "custom_portrait_bottom_width"};
Setting<u16> custom_portrait_bottom_bottom{480, "custom_portrait_bottom_bottom"}; Setting<u16> custom_portrait_bottom_height{480, "custom_portrait_bottom_height"};
SwitchableSetting<float> bg_red{0.f, "bg_red"}; SwitchableSetting<float> bg_red{0.f, "bg_red"};
SwitchableSetting<float> bg_green{0.f, "bg_green"}; SwitchableSetting<float> bg_green{0.f, "bg_green"};

62
src/core/frontend/framebuffer_layout.cpp
View file

@ -387,25 +387,27 @@ FramebufferLayout CustomFrameLayout(u32 width, u32 height, bool is_swapped, bool
ASSERT(height > 0); ASSERT(height > 0);
FramebufferLayout res{width, height, true, true, {}, {}, !Settings::values.upright_screen}; FramebufferLayout res{width, height, true, true, {}, {}, !Settings::values.upright_screen};
u16 top_left = is_portrait_mode ? Settings::values.custom_portrait_top_left.GetValue() u16 top_x = is_portrait_mode ? Settings::values.custom_portrait_top_x.GetValue()
: Settings::values.custom_top_left.GetValue(); : Settings::values.custom_top_x.GetValue();
u16 top_right = is_portrait_mode ? Settings::values.custom_portrait_top_right.GetValue() u16 top_width = is_portrait_mode ? Settings::values.custom_portrait_top_width.GetValue()
: Settings::values.custom_top_right.GetValue(); : Settings::values.custom_top_width.GetValue();
u16 top_top = is_portrait_mode ? Settings::values.custom_portrait_top_top.GetValue() u16 top_y = is_portrait_mode ? Settings::values.custom_portrait_top_y.GetValue()
: Settings::values.custom_top_top.GetValue(); : Settings::values.custom_top_y.GetValue();
u16 top_bottom = is_portrait_mode ? Settings::values.custom_portrait_top_bottom.GetValue() u16 top_height = is_portrait_mode ? Settings::values.custom_portrait_top_height.GetValue()
: Settings::values.custom_top_bottom.GetValue(); : Settings::values.custom_top_height.GetValue();
u16 bottom_left = is_portrait_mode ? Settings::values.custom_portrait_bottom_left.GetValue() u16 bottom_x = is_portrait_mode ? Settings::values.custom_portrait_bottom_x.GetValue()
: Settings::values.custom_bottom_left.GetValue(); : Settings::values.custom_bottom_x.GetValue();
u16 bottom_right = is_portrait_mode ? Settings::values.custom_portrait_bottom_right.GetValue() u16 bottom_width = is_portrait_mode ? Settings::values.custom_portrait_bottom_width.GetValue()
: Settings::values.custom_bottom_right.GetValue(); : Settings::values.custom_bottom_width.GetValue();
u16 bottom_top = is_portrait_mode ? Settings::values.custom_portrait_bottom_top.GetValue() u16 bottom_y = is_portrait_mode ? Settings::values.custom_portrait_bottom_y.GetValue()
: Settings::values.custom_bottom_top.GetValue(); : Settings::values.custom_bottom_y.GetValue();
u16 bottom_bottom = is_portrait_mode ? Settings::values.custom_portrait_bottom_bottom.GetValue() u16 bottom_height = is_portrait_mode ? Settings::values.custom_portrait_bottom_height.GetValue()
: Settings::values.custom_bottom_bottom.GetValue(); : Settings::values.custom_bottom_height.GetValue();
Common::Rectangle<u32> top_screen{top_left, top_top, top_right, top_bottom}; Common::Rectangle<u32> top_screen{top_x, top_y, (u32)(top_x + top_width),
Common::Rectangle<u32> bot_screen{bottom_left, bottom_top, bottom_right, bottom_bottom}; (u32)(top_y + top_height)};
Common::Rectangle<u32> bot_screen{bottom_x, bottom_y, (u32)(bottom_x + bottom_width),
(u32)(bottom_y + bottom_height)};
if (is_swapped) { if (is_swapped) {
res.top_screen = bot_screen; res.top_screen = bot_screen;
@ -421,17 +423,25 @@ FramebufferLayout FrameLayoutFromResolutionScale(u32 res_scale, bool is_secondar
bool is_portrait_mode = bool is_portrait_mode =
Settings::values.layout_option.GetValue() == Settings::LayoutOption::MobilePortrait; Settings::values.layout_option.GetValue() == Settings::LayoutOption::MobilePortrait;
if (Settings::values.custom_layout.GetValue() == true && !is_portrait_mode) { if (Settings::values.custom_layout.GetValue() == true && !is_portrait_mode) {
return CustomFrameLayout(std::max(Settings::values.custom_top_right.GetValue(), return CustomFrameLayout(std::max(Settings::values.custom_top_x.GetValue() +
Settings::values.custom_bottom_right.GetValue()), Settings::values.custom_top_width.GetValue(),
std::max(Settings::values.custom_top_bottom.GetValue(), Settings::values.custom_bottom_x.GetValue() +
Settings::values.custom_bottom_bottom.GetValue()), Settings::values.custom_bottom_width.GetValue()),
std::max(Settings::values.custom_top_y.GetValue() +
Settings::values.custom_top_height.GetValue(),
Settings::values.custom_bottom_y.GetValue() +
Settings::values.custom_bottom_height.GetValue()),
Settings::values.swap_screen.GetValue(), is_portrait_mode); Settings::values.swap_screen.GetValue(), is_portrait_mode);
} else if (Settings::values.custom_portrait_layout.GetValue() == true && is_portrait_mode) { } else if (Settings::values.custom_portrait_layout.GetValue() == true && is_portrait_mode) {
return CustomFrameLayout( return CustomFrameLayout(
std::max(Settings::values.custom_portrait_top_right.GetValue(), std::max(Settings::values.custom_portrait_top_x.GetValue() +
Settings::values.custom_portrait_bottom_right.GetValue()), Settings::values.custom_portrait_top_width.GetValue(),
std::max(Settings::values.custom_portrait_top_bottom.GetValue(), Settings::values.custom_portrait_bottom_x.GetValue() +
Settings::values.custom_portrait_bottom_bottom.GetValue()), Settings::values.custom_portrait_bottom_width.GetValue()),
std::max(Settings::values.custom_portrait_top_y.GetValue() +
Settings::values.custom_portrait_top_height.GetValue(),
Settings::values.custom_portrait_bottom_y.GetValue() +
Settings::values.custom_portrait_bottom_height.GetValue()),
Settings::values.swap_screen.GetValue(), is_portrait_mode); Settings::values.swap_screen.GetValue(), is_portrait_mode);
} }

16
src/lime/config.cpp
View file

@ -184,14 +184,14 @@ void Config::ReadValues() {
ReadSetting("Layout", Settings::values.screen_bottom_topbottom_padding); ReadSetting("Layout", Settings::values.screen_bottom_topbottom_padding);
ReadSetting("Layout", Settings::values.custom_portrait_layout); ReadSetting("Layout", Settings::values.custom_portrait_layout);
ReadSetting("Layout", Settings::values.custom_portrait_top_left); ReadSetting("Layout", Settings::values.custom_portrait_top_x);
ReadSetting("Layout", Settings::values.custom_portrait_top_top); ReadSetting("Layout", Settings::values.custom_portrait_top_y);
ReadSetting("Layout", Settings::values.custom_portrait_top_right); ReadSetting("Layout", Settings::values.custom_portrait_top_width);
ReadSetting("Layout", Settings::values.custom_portrait_top_bottom); ReadSetting("Layout", Settings::values.custom_portrait_top_height);
ReadSetting("Layout", Settings::values.custom_portrait_bottom_left); ReadSetting("Layout", Settings::values.custom_portrait_bottom_x);
ReadSetting("Layout", Settings::values.custom_portrait_bottom_top); ReadSetting("Layout", Settings::values.custom_portrait_bottom_y);
ReadSetting("Layout", Settings::values.custom_portrait_bottom_right); ReadSetting("Layout", Settings::values.custom_portrait_bottom_width);
ReadSetting("Layout", Settings::values.custom_portrait_bottom_bottom); ReadSetting("Layout", Settings::values.custom_portrait_bottom_height);
// Utility // Utility
ReadSetting("Utility", Settings::values.dump_textures); ReadSetting("Utility", Settings::values.dump_textures);

32
src/lime_qt/configuration/config.cpp
View file

@ -539,14 +539,14 @@ void Config::ReadLayoutValues() {
ReadBasicSetting(Settings::values.screen_bottom_leftright_padding); ReadBasicSetting(Settings::values.screen_bottom_leftright_padding);
ReadBasicSetting(Settings::values.screen_bottom_topbottom_padding); ReadBasicSetting(Settings::values.screen_bottom_topbottom_padding);
ReadBasicSetting(Settings::values.custom_portrait_layout); ReadBasicSetting(Settings::values.custom_portrait_layout);
ReadBasicSetting(Settings::values.custom_portrait_top_left); ReadBasicSetting(Settings::values.custom_portrait_top_x);
ReadBasicSetting(Settings::values.custom_portrait_top_top); ReadBasicSetting(Settings::values.custom_portrait_top_y);
ReadBasicSetting(Settings::values.custom_portrait_top_right); ReadBasicSetting(Settings::values.custom_portrait_top_width);
ReadBasicSetting(Settings::values.custom_portrait_top_bottom); ReadBasicSetting(Settings::values.custom_portrait_top_height);
ReadBasicSetting(Settings::values.custom_portrait_bottom_left); ReadBasicSetting(Settings::values.custom_portrait_bottom_x);
ReadBasicSetting(Settings::values.custom_portrait_bottom_top); ReadBasicSetting(Settings::values.custom_portrait_bottom_y);
ReadBasicSetting(Settings::values.custom_portrait_bottom_right); ReadBasicSetting(Settings::values.custom_portrait_bottom_width);
ReadBasicSetting(Settings::values.custom_portrait_bottom_bottom); ReadBasicSetting(Settings::values.custom_portrait_bottom_height);
} }
qt_config->endGroup(); qt_config->endGroup();
@ -1100,14 +1100,14 @@ void Config::SaveLayoutValues() {
WriteBasicSetting(Settings::values.screen_bottom_leftright_padding); WriteBasicSetting(Settings::values.screen_bottom_leftright_padding);
WriteBasicSetting(Settings::values.screen_bottom_topbottom_padding); WriteBasicSetting(Settings::values.screen_bottom_topbottom_padding);
WriteBasicSetting(Settings::values.custom_portrait_layout); WriteBasicSetting(Settings::values.custom_portrait_layout);
WriteBasicSetting(Settings::values.custom_portrait_top_left); WriteBasicSetting(Settings::values.custom_portrait_top_x);
WriteBasicSetting(Settings::values.custom_portrait_top_top); WriteBasicSetting(Settings::values.custom_portrait_top_y);
WriteBasicSetting(Settings::values.custom_portrait_top_right); WriteBasicSetting(Settings::values.custom_portrait_top_width);
WriteBasicSetting(Settings::values.custom_portrait_top_bottom); WriteBasicSetting(Settings::values.custom_portrait_top_height);
WriteBasicSetting(Settings::values.custom_portrait_bottom_left); WriteBasicSetting(Settings::values.custom_portrait_bottom_x);
WriteBasicSetting(Settings::values.custom_portrait_bottom_top); WriteBasicSetting(Settings::values.custom_portrait_bottom_y);
WriteBasicSetting(Settings::values.custom_portrait_bottom_right); WriteBasicSetting(Settings::values.custom_portrait_bottom_width);
WriteBasicSetting(Settings::values.custom_portrait_bottom_bottom); WriteBasicSetting(Settings::values.custom_portrait_bottom_height);
} }
qt_config->endGroup(); qt_config->endGroup();