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

Pull ROM info from build.prop for backup names

Browse Source 
Change-Id: I7847fca22b5d4f0a35da41625b15bd677a1e9768
This commit is contained in:
Dees Troy
2013-09-12 09:11:13 -05:00
committed by Gerrit Code Review
parent 893136dc45
commit b21cc64ca8
21 changed files with 294 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/button.cpp
+10 -13
View File
@@ -110,10 +110,11 @@ GUIButton::GUIButton(xml_node<>* node)
}
int x, y, w, h;
TextPlacement = TOP_LEFT;
if (mButtonImg) {
mButtonImg->GetRenderPos(x, y, w, h);
} else if (hasFill) {
LoadPlacement(node->first_node("placement"), &x, &y, &w, &h);
LoadPlacement(node->first_node("placement"), &x, &y, &w, &h, &TextPlacement);
}
SetRenderPos(x, y, w, h);
return;
@@ -150,14 +151,12 @@ int GUIButton::Render(void)
mButtonLabel->GetCurrentBounds(w, h);
if (w != mTextW) {
mTextW = w;
// As a special case, we'll allow large text which automatically moves it to the right.
if (mTextW > mRenderW)
{
if (TextPlacement == CENTER_X_ONLY) {
mTextX = ((mRenderW - mRenderX) / 2);
} else if (mTextW > mRenderW) { // As a special case, we'll allow large text which automatically moves it to the right.
mTextX = mRenderW + mRenderX + 5;
mRenderW += mTextW + 5;
}
else
{
} else {
mTextX = mRenderX + ((mRenderW - mTextW) / 2);
}
mButtonLabel->SetRenderPos(mTextX, mTextY);
@@ -231,14 +230,12 @@ int GUIButton::SetRenderPos(int x, int y, int w, int h)
if (mButtonLabel) mButtonLabel->GetCurrentBounds(mTextW, mTextH);
if (mTextW)
{
// As a special case, we'll allow large text which automatically moves it to the right.
if (mTextW > mRenderW)
{
if (TextPlacement == CENTER_X_ONLY) {
mTextX = ((mRenderW - mRenderX) / 2);
} else if (mTextW > mRenderW) { // As a special case, we'll allow large text which automatically moves it to the right.
mTextX = mRenderW + mRenderX + 5;
mRenderW += mTextW + 5;
}
else
{
} else {
mTextX = mRenderX + ((mRenderW - mTextW) / 2);
}
}