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

Merge AOSP android-9.0.0_r3

Browse Source 
Fix conflicts and make it build in 5.1, 6.0, 7.1, 8.1, and 9.0

Change-Id: Ida0a64c29ff27d339b7f42a18d820930964ac6e4
This commit is contained in:
Ethan Yonker
2018-08-24 11:17:36 -05:00
parent 32aef7a2cf 896de5423d
commit 58f2132bc3
208 changed files with 9097 additions and 4512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gui/button.cpp
View File

@@ -45,9 +45,6 @@ extern "C" {
GUIButton::GUIButton(xml_node<>* node)
: GUIObject(node)
{
xml_attribute<>* attr;
xml_node<>* child;
mButtonImg = NULL;
mButtonIcon = NULL;
mButtonLabel = NULL;
@@ -201,9 +198,12 @@ int GUIButton::SetRenderPos(int x, int y, int w, int h)
mRenderW = w;
mRenderH = h;
}
mIconW = mIconH = 0;
mIconW = mButtonIcon->GetWidth();
mIconH = mButtonIcon->GetHeight();
if (mButtonIcon && mButtonIcon->GetResource()) {
mIconW = mButtonIcon->GetWidth();
mIconH = mButtonIcon->GetHeight();
}
mTextH = 0;
mTextW = 0;