PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support theme width and height offsets

Browse Source 
Current use condition is LG V20, where the secondary screen is
actually just a corner chunk of the main screen.
In this case, we need to shift the UI down some pixels in order
to see it all, but just using Y offsets resulted in losing
the rest of the GUI below.

Example in BoardConfig.mk:
  # Shift TWRP off the secondary screen
  TW_Y_OFFSET := 160
  TW_H_OFFSET := -160

Change-Id: I5a06638ba0d05e5b9fd8a6245c630d6ea3394f78
This commit is contained in:
James Christopher Adduono
2016-11-06 13:17:34 -05:00
committed by Dees Troy
parent b29a5e27c3
commit dcd1e440e0
3 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/pages.cpp
+22 -5
View File
@@ -71,6 +71,8 @@ std::vector<language_struct> Language_List;
int tw_x_offset = 0;
int tw_y_offset = 0;
int tw_w_offset = 0;
int tw_h_offset = 0;
// Helper routine to convert a string to a color declaration
int ConvertStrToColor(std::string str, COLOR* color)
@@ -895,16 +897,17 @@ int PageSet::LoadDetails(LoadingContext& ctx, xml_node<>* root)
}
#endif
if (width != 0 && height != 0) {
float scale_w = ((float)gr_fb_width() - ((float)offx * 2.0)) / (float)width;
float scale_h = ((float)gr_fb_height() - ((float)offy * 2.0)) / (float)height;
float scale_w = (((float)gr_fb_width() + (float)tw_w_offset) - ((float)offx * 2.0)) / (float)width;
float scale_h = (((float)gr_fb_height() + (float)tw_h_offset) - ((float)offy * 2.0)) / (float)height;
#ifdef TW_ROUND_SCREEN
float scale_off_w = (float)gr_fb_width() / (float)width;
float scale_off_h = (float)gr_fb_height() / (float)height;
float scale_off_w = ((float)gr_fb_width() + (float)tw_w_offset) / (float)width;
float scale_off_h = ((float)gr_fb_height() + (float)tw_h_offset) / (float)height;
tw_x_offset = offx * scale_off_w;
tw_y_offset = offy * scale_off_h;
#endif
if (scale_w != 1 || scale_h != 1) {
LOGINFO("Scaling theme width %fx and height %fx, offsets x: %i y: %i\n", scale_w, scale_h, tw_x_offset, tw_y_offset);
LOGINFO("Scaling theme width %fx and height %fx, offsets x: %i y: %i w: %i h: %i\n",
scale_w, scale_h, tw_x_offset, tw_y_offset, tw_w_offset, tw_h_offset);
set_scale_values(scale_w, scale_h);
}
}
@@ -1018,6 +1021,16 @@ int PageSet::LoadVariables(xml_node<>* vars)
child = child->next_sibling("variable");
continue;
}
if (strcmp(name->value(), "tw_w_offset") == 0) {
tw_w_offset = atoi(value->value());
child = child->next_sibling("variable");
continue;
}
if (strcmp(name->value(), "tw_h_offset") == 0) {
tw_h_offset = atoi(value->value());
child = child->next_sibling("variable");
continue;
}
p = persist ? atoi(persist->value()) : 0;
string temp = value->value();
string valstr = gui_parse_text(temp);
@@ -1340,6 +1353,8 @@ int PageManager::LoadPackage(std::string name, std::string package, std::string
LOGINFO("Load XML directly\n");
tw_x_offset = TW_X_OFFSET;
tw_y_offset = TW_Y_OFFSET;
tw_w_offset = TW_W_OFFSET;
tw_h_offset = TW_H_OFFSET;
if (name != "splash") {
LoadLanguageList(NULL);
languageFile = LoadFileToBuffer(TWRES "languages/en.xml", NULL);
@@ -1351,6 +1366,8 @@ int PageManager::LoadPackage(std::string name, std::string package, std::string
LOGINFO("Loading zip theme\n");
tw_x_offset = 0;
tw_y_offset = 0;
tw_w_offset = 0;
tw_h_offset = 0;
if (!TWFunc::Path_Exists(package))
return -1;
if (sysMapFile(package.c_str(), &map) != 0) {